From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 7 Sep 2008 02:09:16 +0000 (-0700)
Subject: diff Porcelain: do not disable auto index refreshing on -C -C
X-Git-Tag: v1.6.0.3~79^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9d865356abc08b253bc15b5fb50471d80c828be1;p=git.git

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>
---

diff --git a/diff.c b/diff.c
index b3a7da70a..85d690183 100644
--- a/diff.c
+++ b/diff.c
@@ -3394,7 +3394,7 @@ void diffcore_std(struct diff_options *options)
 	if (DIFF_OPT_TST(options, QUIET))
 		return;
 
-	if (options->skip_stat_unmatch && !DIFF_OPT_TST(options, FIND_COPIES_HARDER))
+	if (options->skip_stat_unmatch)
 		diffcore_skip_stat_unmatch(options);
 	if (options->break_opt != -1)
 		diffcore_break(options->break_opt);