diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-10-24 09:10:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-24 09:10:37 -0700 |
| commit | 5139fce01fc4214d12b91e6a21f9c50fd3a7cd50 (patch) | |
| tree | 70307bb80faeabc466d8bcfde9e3019065e37809 | |
| parent | 88b3704ab17b16d5d6f7f5cf7129e800ad22e282 (diff) | |
| parent | 3da4413dbcdb8df021739ca6f20fe4f0bcd1fd3c (diff) | |
| download | git-5139fce01fc4214d12b91e6a21f9c50fd3a7cd50.tar.gz | |
Merge branch 'jc/diff-from-contents-fix'
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
| -rw-r--r-- | diff.c | 26 |
1 files changed, 23 insertions, 3 deletions
@@ -6828,18 +6828,38 @@ void diff_flush(struct diff_options *options) DIFF_FORMAT_NAME | DIFF_FORMAT_NAME_STATUS | 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++) { struct diff_filepair *p = q->queue[i]; if (!check_pair_status(p)) continue; - if (options->flags.diff_from_contents && - !diff_flush_patch_quietly(p, options)) - continue; + if (options->flags.diff_from_contents) { + FILE *saved_file = options->file; + 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); } + if (options->flags.diff_from_contents) { + fclose(dev_null); + options->color_moved = saved_color_moved; + } separator++; } |