diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-18 20:10:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-18 22:26:28 -0800 |
| commit | 0940e5f211452ec2520d1b04233acddf0a872c06 (patch) | |
| tree | 7e9dc2f563330f4dc410d91da80cc1e6b845406d /t/t4004-diff-rename-symlink.sh | |
| parent | 11f944dd6bdabd003325c85dc60b16389d012361 (diff) | |
| download | git-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/t4004-diff-rename-symlink.sh')
| -rwxr-xr-x | t/t4004-diff-rename-symlink.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4004-diff-rename-symlink.sh b/t/t4004-diff-rename-symlink.sh index 92a65f485..6e562c80d 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 |