Fossil SCM
On Windows, do not emit warnings when external tools exit with non-zero codes, since those are unreliable at best.
Commit
43ee0921ec3f3a92a87603e24e2f1c795342c567c09ad44f4b2a327569f782b3
Parent
3f30abc80ae4b19…
1 file changed
+4
-2
+4
-2
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -668,12 +668,14 @@ | ||
| 668 | 668 | blob_append_escaped_arg(&cmd, zFile2, 1); |
| 669 | 669 | } |
| 670 | 670 | |
| 671 | 671 | /* Run the external diff command */ |
| 672 | 672 | if( fossil_system(blob_str(&cmd)) ){ |
| 673 | - fossil_warning("External diff command failed: %b\n", | |
| 674 | - &cmd); | |
| 673 | +#if !defined(_WIN32) | |
| 674 | + /* On Windows, exit codes are unreliable. */ | |
| 675 | + fossil_warning("External diff command failed: %b\n", &cmd); | |
| 676 | +#endif | |
| 675 | 677 | } |
| 676 | 678 | |
| 677 | 679 | /* Delete the temporary file and clean up memory used */ |
| 678 | 680 | if( useTempfile ) file_delete(blob_str(&nameFile1)); |
| 679 | 681 | blob_reset(&nameFile1); |
| 680 | 682 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -668,12 +668,14 @@ | |
| 668 | blob_append_escaped_arg(&cmd, zFile2, 1); |
| 669 | } |
| 670 | |
| 671 | /* Run the external diff command */ |
| 672 | if( fossil_system(blob_str(&cmd)) ){ |
| 673 | fossil_warning("External diff command failed: %b\n", |
| 674 | &cmd); |
| 675 | } |
| 676 | |
| 677 | /* Delete the temporary file and clean up memory used */ |
| 678 | if( useTempfile ) file_delete(blob_str(&nameFile1)); |
| 679 | blob_reset(&nameFile1); |
| 680 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -668,12 +668,14 @@ | |
| 668 | blob_append_escaped_arg(&cmd, zFile2, 1); |
| 669 | } |
| 670 | |
| 671 | /* Run the external diff command */ |
| 672 | if( fossil_system(blob_str(&cmd)) ){ |
| 673 | #if !defined(_WIN32) |
| 674 | /* On Windows, exit codes are unreliable. */ |
| 675 | fossil_warning("External diff command failed: %b\n", &cmd); |
| 676 | #endif |
| 677 | } |
| 678 | |
| 679 | /* Delete the temporary file and clean up memory used */ |
| 680 | if( useTempfile ) file_delete(blob_str(&nameFile1)); |
| 681 | blob_reset(&nameFile1); |
| 682 |