X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4001-diff-rename.sh;h=a32692417db73444dbdc143e6908b7371be79d42;hb=d1a43f2aa4bfb5aef29e9e1fe1fb9bb18c0e8b65;hp=2e3c20d6b9468bf413e97d422e7dbe13ac4238cd;hpb=1b2782a5e2f88bf5e6e2cbb58e54fea015e21af5;p=git.git

diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index 2e3c20d6b..a32692417 100755
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh
@@ -27,22 +27,22 @@ Line 15
 '
 
 test_expect_success \
-    'update-cache --add a file.' \
-    'git-update-index --add path0'
+    'update-index --add a file.' \
+    'git update-index --add path0'
 
 test_expect_success \
     'write that tree.' \
-    'tree=$(git-write-tree) && echo $tree'
+    'tree=$(git write-tree) && echo $tree'
 
 sed -e 's/line/Line/' <path0 >path1
 rm -f path0
 test_expect_success \
     'renamed and edited the file.' \
-    'git-update-index --add --remove path0 path1'
+    'git update-index --add --remove path0 path1'
 
 test_expect_success \
-    'git-diff-index -p -M after rename and editing.' \
-    'git-diff-index -p -M $tree >current'
+    'git diff-index -p -M after rename and editing.' \
+    'git diff-index -p -M $tree >current'
 cat >expected <<\EOF
 diff --git a/path0 b/path1
 rename from path0
@@ -64,4 +64,17 @@ test_expect_success \
     'validate the output.' \
     'compare_diff_patch current expected'
 
+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 &&
+	git status | grep "renamed: .*path1 -> subdir/path1"'
+
+test_expect_success  'favour same basenames even with minor differences' '
+	git show HEAD:path1 | sed "s/15/16/" > subdir/path1 &&
+	git status | grep "renamed: .*path1 -> subdir/path1"'
+
 test_done