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

Merge branch 'jc/diff-from-contents-fix' into maint-2.51 

The code to squelch output from "git diff -w --name-status"
etc. for paths that "git diff -w -p" would have stayed silent
leaked output from dry-run patch generation, which has been
corrected.

* jc/diff-from-contents-fix:
  diff: make sure the other caller of diff_flush_patch_quietly() is silent
maint
Junio C Hamano 2025-10-26 19:48:18 -07:00
parent e56c419347 3da4413dbc
commit 306eb9ae56
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
diff.c
View File

@ -6814,18 +6814,38 @@ void diff_flush(struct diff_options *options)
DIFF_FORMAT_NAME | DIFF_FORMAT_NAME |
DIFF_FORMAT_NAME_STATUS | DIFF_FORMAT_NAME_STATUS |
DIFF_FORMAT_CHECKDIFF)) { DIFF_FORMAT_CHECKDIFF)) {
/*
* make sure diff_Flush_patch_quietly() to be silent.
*/
FILE *dev_null = NULL;
int saved_color_moved = options->color_moved;

if (options->flags.diff_from_contents) {
dev_null = xfopen("/dev/null", "w");
options->color_moved = 0;
}
for (i = 0; i < q->nr; i++) { for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i]; struct diff_filepair *p = q->queue[i];


if (!check_pair_status(p)) if (!check_pair_status(p))
continue; continue;


if (options->flags.diff_from_contents && if (options->flags.diff_from_contents) {
!diff_flush_patch_quietly(p, options)) FILE *saved_file = options->file;
continue; int found_changes;


options->file = dev_null;
found_changes = diff_flush_patch_quietly(p, options);
options->file = saved_file;
if (!found_changes)
continue;
}
flush_one_pair(p, options); flush_one_pair(p, options);
} }
if (options->flags.diff_from_contents) {
fclose(dev_null);
options->color_moved = saved_color_moved;
}
separator++; separator++;
} }