aboutsummaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-09-06 19:09:16 -0700
committerJunio C Hamano <gitster@pobox.com>2008-09-06 19:09:16 -0700
commit9d865356abc08b253bc15b5fb50471d80c828be1 (patch)
treedc3e6101f86d3a3771dba906c95b5d50686b5ed5 /diff.c
parentf88d225feb117f0429540da90b2552e198fa2e82 (diff)
downloadgit-9d865356abc08b253bc15b5fb50471d80c828be1.tar.gz
git-9d865356abc08b253bc15b5fb50471d80c828be1.tar.xz
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>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
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);