aboutsummaryrefslogtreecommitdiff
path: root/t/t4005-diff-rename-2.sh
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-18 20:10:32 -0800
committerJunio C Hamano <gitster@pobox.com>2011-02-18 22:26:28 -0800
commit0940e5f211452ec2520d1b04233acddf0a872c06 (patch)
tree7e9dc2f563330f4dc410d91da80cc1e6b845406d /t/t4005-diff-rename-2.sh
parent11f944dd6bdabd003325c85dc60b16389d012361 (diff)
downloadgit-0940e5f211452ec2520d1b04233acddf0a872c06.tar.gz
git-0940e5f211452ec2520d1b04233acddf0a872c06.tar.xz
diffcore-rename: properly honor the difference between -M and -C
We would allow rename detection to do copy detection even when asked purely for renames. That confuses users, but more importantly it can terminally confuse the recursive merge rename logic. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4005-diff-rename-2.sh')
-rwxr-xr-xt/t4005-diff-rename-2.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh
index 1ba359d47..77d7f4946 100755
--- a/t/t4005-diff-rename-2.sh
+++ b/t/t4005-diff-rename-2.sh
@@ -29,7 +29,7 @@ test_expect_success \
# and COPYING.2 are based on COPYING, and do not say anything about
# rezrov.
-git diff-index -M $tree >current
+git diff-index -C $tree >current
cat >expected <<\EOF
:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234 COPYING COPYING.1