@matheusbsbs / matheus-bagliano / commits / 0152831d96

diff: drop save/restore of color_moved in dry-run mode

When running a dry-run content-level diff to check whether a "--quiet" diff has any changes, we have always unset the color_moved variable since the feature was added in 2e2d5ac184 (diff.c: color moved lines differently, 2017-06-30). The reasoning is not given explicitly there, but presumably the idea is that since color_moved requires a lot of extra computation to match lines but does not actually affect the found_changes flag, we want to skip it. Later, in 3da4413dbc (diff: make sure the other caller of diff_flush_patch_quietly() is silent, 2025-10-22) we copied the same idea for other dry-run diffs. But neither spot actually needs to reset this flag at all, because diff_flush_patch() will not ever compute color_moved. Nor could it, as it is only looking at a single file-pair, and we detect moves across files. So color_moved is checked only when we are actually doing real DIFF_FORMAT_PATCH output, and call diff_flush_patch_all_file_pairs(). So we can get rid of these extra lines to save and restore the color_moved flag without changing the behavior at all. (Note that there is no "restore" to drop for the second caller, as we know at that point we are not generating any output and can just leave the feature disabled). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Oct 24, 2025 at 13:07 UTC 0152831d96af40277b0b69ef39e9c31b623dc753

1 file changed -4

diff.c

-4

@@ -6839,11 +6839,9 @@ void diff_flush(struct diff_options *options)

6839 * make sure diff_Flush_patch_quietly() to be silent.

6840 */

6841 FILE *dev_null = NULL;

6842 - int saved_color_moved = options->color_moved;

6842

6843 if (options->flags.diff_from_contents) {

6844 dev_null = xfopen("/dev/null", "w");

6846 - options->color_moved = 0;

6845 }

6846 for (i = 0; i < q->nr; i++) {

6847 struct diff_filepair *p = q->queue[i];

@@ -6865,7 +6863,6 @@ void diff_flush(struct diff_options *options)

6863 }

6864 if (options->flags.diff_from_contents) {

6865 fclose(dev_null);

6868 - options->color_moved = saved_color_moved;

6866 }

6867 separator++;

6868 }

@@ -6925,7 +6922,6 @@ void diff_flush(struct diff_options *options)

6922 diff_free_file(options);

6923 options->file = xfopen("/dev/null", "w");

6924 options->close_file = 1;

6928 - options->color_moved = 0;

6925 for (i = 0; i < q->nr; i++) {

6926 struct diff_filepair *p = q->queue[i];

6927 if (check_pair_status(p))