@matheusbsbs / matheus-bagliano / commits / 9d865356ab
Fork 0

diff Porcelain: do not disable auto index refreshing on -C -C

When we enabled the automatic refreshing of the index to "diff" Porcelain, we disabled it when --find-copies-harder was asked, but there is no good reason to do so. In the following command sequence, the first "diff" shows an "empty" diff exposing stat dirtyness, while the second one does not. $ >foo $ git add foo $ touch foo $ git diff -C -C $ git diff -C This fixes the inconsistency. Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Sep 6, 2008 at 19:09 UTC 9d865356abc08b253bc15b5fb50471d80c828be1
1 file changed +1 -1
diff.c
+1 -1
@@ -3394,7 +3394,7 @@ void diffcore_std(struct diff_options *options)
3394 if (DIFF_OPT_TST(options, QUIET))
3395 return;
3396
3397 - if (options->skip_stat_unmatch && !DIFF_OPT_TST(options, FIND_COPIES_HARDER))
3397 + if (options->skip_stat_unmatch)
3398 diffcore_skip_stat_unmatch(options);
3399 if (options->break_opt != -1)
3400 diffcore_break(options->break_opt);