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/t4008-diff-break-rewrite.sh | |
| parent | 11f944dd6bdabd003325c85dc60b16389d012361 (diff) | |
| download | git-0940e5f211452ec2520d1b04233acddf0a872c06.tar.gz | |
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/t4008-diff-break-rewrite.sh')
| -rwxr-xr-x | t/t4008-diff-break-rewrite.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4008-diff-break-rewrite.sh b/t/t4008-diff-break-rewrite.sh index d79d9e1e71..73b4a24f5e 100755 --- a/t/t4008-diff-break-rewrite.sh +++ b/t/t4008-diff-break-rewrite.sh @@ -173,8 +173,8 @@ test_expect_success \ 'compare_diff_raw expected current' test_expect_success \ - 'run diff with -B -M' \ - 'git diff-index -B -M "$tree" >current' + 'run diff with -B -C' \ + 'git diff-index -B -C "$tree" >current' cat >expected <<\EOF :100644 100644 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 08bb2fb671deff4c03a4d4a0a1315dff98d5732c C095 file0 file1 |