summaryrefslogtreecommitdiff
path: root/t/t4007-rename-3.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-06-19 13:14:05 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-19 20:13:18 -0700
commit4727f640036fbdad414bdcbe31d08f6a8fd70923 (patch)
tree5458d4661aed71ae5864f663f636cf9707e43e9e /t/t4007-rename-3.sh
parent170241b7d1437e082c13a6f6b812eb827a7d48e0 (diff)
downloadgit-4727f640036fbdad414bdcbe31d08f6a8fd70923.tar.gz
[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 <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 't/t4007-rename-3.sh')
-rw-r--r--t/t4007-rename-3.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4007-rename-3.sh b/t/t4007-rename-3.sh
index a55d6b65d1..ab83ea3b8a 100644
--- a/t/t4007-rename-3.sh
+++ b/t/t4007-rename-3.sh
@@ -26,7 +26,7 @@ test_expect_success \
# path1 both have COPYING and the latter is a copy of path0/COPYING.
# Comparing the full tree with cache should tell us so.
-git-diff-cache -C $tree >current
+git-diff-cache -C --find-copies-harder $tree >current
cat >expected <<\EOF
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 C100 path0/COPYING path1/COPYING