path: root/t/
diff options
authorJunio C Hamano <>2005-06-19 20:14:05 (GMT)
committerLinus Torvalds <>2005-06-20 03:13:18 (GMT)
commit4727f640036fbdad414bdcbe31d08f6a8fd70923 (patch)
tree5458d4661aed71ae5864f663f636cf9707e43e9e /t/
parent170241b7d1437e082c13a6f6b812eb827a7d48e0 (diff)
[PATCH] Make -C less eager.
Like diff-tree, this patch makes -C option for diff-* brothers to use only pre-image of modified files as rename/copy detection by default. Give --find-copies-harder to use unmodified files to find copies from as well. This also fixes "diff-files -C" problem earlier noticed by Linus. It was feeding the null sha1 even when the file in the work tree was known to match what is in the index file. This resulted in diff-files showing everything in the project. Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 't/')
1 files changed, 2 insertions, 1 deletions
diff --git a/t/ b/t/
index 63a3103..8e3091a 100644
--- a/t/
+++ b/t/
@@ -108,7 +108,8 @@ test_expect_success \
# the diff-core. Unchanged rezrov, although being fed to
# git-diff-cache as well, should not be mentioned.
-GIT_DIFF_OPTS=--unified=0 git-diff-cache -C -p $tree >current
+GIT_DIFF_OPTS=--unified=0 \
+ git-diff-cache -C --find-copies-harder -p $tree >current
cat >expected <<\EOF
diff --git a/COPYING b/COPYING.1
copy from COPYING