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/t4003-diff-rename-1.sh | |
| parent | for_each_hash: allow passing a 'void *data' pointer to callback (diff) | |
| download | tgif-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/t4003-diff-rename-1.sh')
| -rwxr-xr-x | t/t4003-diff-rename-1.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4003-diff-rename-1.sh b/t/t4003-diff-rename-1.sh index c6130c4019..bfa8835638 100755 --- a/t/t4003-diff-rename-1.sh +++ b/t/t4003-diff-rename-1.sh @@ -29,7 +29,7 @@ test_expect_success \ # copy-and-edit one, and rename-and-edit the other. We do not say # anything about rezrov. -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/COPYING b/COPYING.1 copy from COPYING |