summaryrefslogtreecommitdiff
path: root/t/t4004-diff-rename-symlink.sh
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-19 04:10:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-02-19 06:26:28 (GMT)
commit0940e5f211452ec2520d1b04233acddf0a872c06 (patch)
tree7e9dc2f563330f4dc410d91da80cc1e6b845406d /t/t4004-diff-rename-symlink.sh
parent11f944dd6bdabd003325c85dc60b16389d012361 (diff)
downloadgit-0940e5f211452ec2520d1b04233acddf0a872c06.zip
git-0940e5f211452ec2520d1b04233acddf0a872c06.tar.gz
git-0940e5f211452ec2520d1b04233acddf0a872c06.tar.bz2
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/t4004-diff-rename-symlink.sh')
-rwxr-xr-xt/t4004-diff-rename-symlink.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4004-diff-rename-symlink.sh b/t/t4004-diff-rename-symlink.sh
index 92a65f4..6e562c8 100755
--- a/t/t4004-diff-rename-symlink.sh
+++ b/t/t4004-diff-rename-symlink.sh
@@ -35,7 +35,7 @@ test_expect_success SYMLINKS \
# a new creation.
test_expect_success SYMLINKS 'setup diff output' "
- GIT_DIFF_OPTS=--unified=0 git diff-index -M -p $tree >current &&
+ GIT_DIFF_OPTS=--unified=0 git diff-index -C -p $tree >current &&
cat >expected <<\EOF
diff --git a/bozbar b/bozbar
new file mode 120000