summaryrefslogtreecommitdiff
path: root/t/t4008-diff-break-rewrite.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-01 06:22:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-02 10:24:46 (GMT)
commitb45563a229f5150271837cf487a91ddd8224fbd3 (patch)
treea0b363c225777490a4c22adaf280ea7ef69f7772 /t/t4008-diff-break-rewrite.sh
parent1c46ab1fada6eb449336a624995293cdd74f2b08 (diff)
downloadgit-b45563a229f5150271837cf487a91ddd8224fbd3.zip
git-b45563a229f5150271837cf487a91ddd8224fbd3.tar.gz
git-b45563a229f5150271837cf487a91ddd8224fbd3.tar.bz2
rename: Break filepairs with different types.
When we consider if a path has been totally rewritten, we did not touch changes from symlinks to files or vice versa. But a change that modifies even the type of a blob surely should count as a complete rewrite. While we are at it, modernise diffcore-break to be aware of gitlinks (we do not want to touch them). Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4008-diff-break-rewrite.sh')
-rwxr-xr-xt/t4008-diff-break-rewrite.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t4008-diff-break-rewrite.sh b/t/t4008-diff-break-rewrite.sh
index 1287d2a..26c2e4a 100755
--- a/t/t4008-diff-break-rewrite.sh
+++ b/t/t4008-diff-break-rewrite.sh
@@ -122,11 +122,11 @@ test_expect_success \
'run diff with -B -M' \
'git diff-index -B -M "$tree" >current'
-# This should not mistake file0 as the copy source of new file1
-# due to type differences.
+# file0 changed from regular to symlink. file1 is very close to the preimage of file0.
+# because we break file0, file1 can become a rename of it.
cat >expected <<\EOF
:100644 120000 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 67be421f88824578857624f7b3dc75e99a8a1481 T file0
-:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 M100 file1
+:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 f5deac7be59e7eeab8657fd9ae706fd6a57daed2 R file0 file1
EOF
test_expect_success \