kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'rs/external-diff-with-exit-code' 

* rs/external-diff-with-exit-code:
  Revert "diff: fix --exit-code with external diff"
maint
Junio C Hamano 2024-05-16 10:09:23 -07:00
parent 19fe900cfc e37423f081
commit db271e7bb6
2 changed files with 3 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
diff.c
View File

@ -40,7 +40,6 @@
#include "setup.h" #include "setup.h"
#include "strmap.h" #include "strmap.h"
#include "ws.h" #include "ws.h"
#include "write-or-die.h"


#ifdef NO_FAST_WORKING_DIRECTORY #ifdef NO_FAST_WORKING_DIRECTORY
#define FAST_WORKING_DIRECTORY 0 #define FAST_WORKING_DIRECTORY 0
@ -4405,33 +4404,8 @@ static void run_external_diff(const char *pgm,
diff_free_filespec_data(one); diff_free_filespec_data(one);
diff_free_filespec_data(two); diff_free_filespec_data(two);
cmd.use_shell = 1; cmd.use_shell = 1;
if (o->flags.diff_from_contents) { if (run_command(&cmd))
int got_output = 0; die(_("external diff died, stopping at %s"), name);
cmd.out = -1;
if (start_command(&cmd))
die(_("external diff died, stopping at %s"), name);
for (;;) {
char buffer[8192];
ssize_t len = xread(cmd.out, buffer, sizeof(buffer));
if (!len)
break;
if (len < 0)
die(_("unable to read from external diff,"
" stopping at %s"), name);
got_output = 1;
if (write_in_full(1, buffer, len) < 0)
die(_("unable to write output of external diff,"
" stopping at %s"), name);
}
close(cmd.out);
if (finish_command(&cmd))
die(_("external diff died, stopping at %s"), name);
if (got_output)
o->found_changes = 1;
} else {
if (run_command(&cmd))
die(_("external diff died, stopping at %s"), name);
}


remove_tempfile(); remove_tempfile();
} }
@ -4878,7 +4852,6 @@ void diff_setup_done(struct diff_options *options)
*/ */


if ((options->xdl_opts & XDF_WHITESPACE_FLAGS) || if ((options->xdl_opts & XDF_WHITESPACE_FLAGS) ||
options->flags.exit_with_status ||
options->ignore_regex_nr) options->ignore_regex_nr)
options->flags.diff_from_contents = 1; options->flags.diff_from_contents = 1;
else else
@ -6769,7 +6742,7 @@ void diff_flush(struct diff_options *options)
if (output_format & DIFF_FORMAT_CALLBACK) if (output_format & DIFF_FORMAT_CALLBACK)
options->format_callback(q, options, options->format_callback_data); options->format_callback(q, options, options->format_callback_data);


if ((!output_format || output_format & DIFF_FORMAT_NO_OUTPUT) && if (output_format & DIFF_FORMAT_NO_OUTPUT &&
options->flags.exit_with_status && options->flags.exit_with_status &&
options->flags.diff_from_contents) { options->flags.diff_from_contents) {
/* /*

8
t/t4020-diff-external.sh
View File

@ -172,14 +172,6 @@ test_expect_success 'no diff with -diff' '
grep Binary out grep Binary out
' '


test_expect_success 'diff.external and --exit-code with output' '
test_expect_code 1 git -c diff.external=echo diff --exit-code
'

test_expect_success 'diff.external and --exit-code without output' '
git -c diff.external=true diff --exit-code
'

echo NULZbetweenZwords | perl -pe 'y/Z/\000/' > file echo NULZbetweenZwords | perl -pe 'y/Z/\000/' > file


test_expect_success 'force diff with "diff"' ' test_expect_success 'force diff with "diff"' '