2005-05-19 18:32:35 +08:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='Test rename detection in diff engine.
|
|
|
|
|
|
|
|
'
|
|
|
|
. ./test-lib.sh
|
2008-08-08 17:26:28 +08:00
|
|
|
. "$TEST_DIRECTORY"/diff-lib.sh
|
2005-05-19 18:32:35 +08:00
|
|
|
|
|
|
|
echo >path0 'Line 1
|
|
|
|
Line 2
|
|
|
|
Line 3
|
|
|
|
Line 4
|
|
|
|
Line 5
|
|
|
|
Line 6
|
|
|
|
Line 7
|
|
|
|
Line 8
|
|
|
|
Line 9
|
|
|
|
Line 10
|
|
|
|
line 11
|
|
|
|
Line 12
|
|
|
|
Line 13
|
|
|
|
Line 14
|
|
|
|
Line 15
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success \
|
2007-11-30 19:35:23 +08:00
|
|
|
'update-index --add a file.' \
|
2007-07-03 13:52:14 +08:00
|
|
|
'git update-index --add path0'
|
2005-05-19 18:32:35 +08:00
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'write that tree.' \
|
2007-07-03 13:52:14 +08:00
|
|
|
'tree=$(git write-tree) && echo $tree'
|
2005-05-19 18:32:35 +08:00
|
|
|
|
|
|
|
sed -e 's/line/Line/' <path0 >path1
|
|
|
|
rm -f path0
|
|
|
|
test_expect_success \
|
|
|
|
'renamed and edited the file.' \
|
2007-07-03 13:52:14 +08:00
|
|
|
'git update-index --add --remove path0 path1'
|
2005-05-19 18:32:35 +08:00
|
|
|
|
|
|
|
test_expect_success \
|
2007-07-03 13:52:14 +08:00
|
|
|
'git diff-index -p -M after rename and editing.' \
|
|
|
|
'git diff-index -p -M $tree >current'
|
2005-05-19 18:32:35 +08:00
|
|
|
cat >expected <<\EOF
|
|
|
|
diff --git a/path0 b/path1
|
2005-06-06 06:31:52 +08:00
|
|
|
rename from path0
|
|
|
|
rename to path1
|
2005-05-19 18:32:35 +08:00
|
|
|
--- a/path0
|
|
|
|
+++ b/path1
|
2006-03-28 10:23:31 +08:00
|
|
|
@@ -8,7 +8,7 @@ Line 7
|
2005-05-19 18:32:35 +08:00
|
|
|
Line 8
|
|
|
|
Line 9
|
|
|
|
Line 10
|
|
|
|
-line 11
|
|
|
|
+Line 11
|
|
|
|
Line 12
|
|
|
|
Line 13
|
|
|
|
Line 14
|
|
|
|
EOF
|
2005-05-20 10:00:36 +08:00
|
|
|
|
|
|
|
test_expect_success \
|
|
|
|
'validate the output.' \
|
2005-10-07 18:42:00 +08:00
|
|
|
'compare_diff_patch current expected'
|
2005-05-20 10:00:36 +08:00
|
|
|
|
2007-06-21 19:52:11 +08:00
|
|
|
test_expect_success 'favour same basenames over different ones' '
|
|
|
|
cp path1 another-path &&
|
|
|
|
git add another-path &&
|
|
|
|
git commit -m 1 &&
|
|
|
|
git rm path1 &&
|
|
|
|
mkdir subdir &&
|
|
|
|
git mv another-path subdir/path1 &&
|
2007-11-15 14:27:57 +08:00
|
|
|
git status | grep "renamed: .*path1 -> subdir/path1"'
|
2007-06-21 19:52:11 +08:00
|
|
|
|
|
|
|
test_expect_success 'favour same basenames even with minor differences' '
|
|
|
|
git show HEAD:path1 | sed "s/15/16/" > subdir/path1 &&
|
2007-11-15 14:27:57 +08:00
|
|
|
git status | grep "renamed: .*path1 -> subdir/path1"'
|
2007-06-21 19:52:11 +08:00
|
|
|
|
2005-05-20 10:00:36 +08:00
|
|
|
test_done
|