averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

diff: make sure the other caller of diff_flush_patch_quietly() is silent

Browse Source 
Earlier, we added is a protection for the loop that computes "git
diff --quiet -w" to ensure calls to the diff_flush_patch_quietly()
helper stays quiet.  Do the same for another loop that deals with
options like "--name-status" to make calls to the same helper.

Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2025-10-22 10:39:12 -07:00
parent 623f7af284
commit 3da4413dbc
1 changed files with 23 additions and 3 deletions
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++;
} }