Differences From Artifact [30179ce219]:

• File src/diffcmd.c — part of check-in [43ee0921ec] at 2025-03-18 15:49:41 on branch trunk — On Windows, do not emit warnings when external tools exit with non-zero codes, since those are unreliable at best. (user: danield size: 48790) [more...]

To Artifact [c071d8b030]:

• File src/diffcmd.c — part of check-in [9b04150885] at 2025-05-31 15:08:24 on branch trunk — Backout recent changes which was reporting error when external diff command exit with non 0 value. It's common for cli diff programs (e.g. gnu-diff and bsd-diff) to return 1 when files differ. Looking for a more "generic" solution. (user: mgagnon size: 48607) [more...]

665
666
667
668
669
670
671
672

673
674
675
676
677
678
679
680
681
682
683
684

665
666
667
668
669
670
671

672





673
674
675
676
677
678
679

-
+
-
-
-
-
-

      blob_append_escaped_arg(&cmd, blob_str(&nameFile1), 1);
    }else{
      blob_append_escaped_arg(&cmd, blob_str(&nameFile1), 1);
      blob_append_escaped_arg(&cmd, zFile2, 1);
    }

    /* Run the external diff command */
    if( fossil_system(blob_str(&cmd)) ){
    fossil_system(blob_str(&cmd));
#if !defined(_WIN32)
      /* On Windows, exit codes are unreliable. */     
      fossil_warning("External diff command failed: %b\n", &cmd);
#endif                     
    }

    /* Delete the temporary file and clean up memory used */
    if( useTempfile ) file_delete(blob_str(&nameFile1));
    blob_reset(&nameFile1);
    blob_reset(&cmd);
  }
}