Merge branch 'lt/setup' into __/setup-n-mv

diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index 065ddb71a9b7414028cef0841ce00396673d2ced..2e3c20d6b9468bf413e97d422e7dbe13ac4238cd 100755 (executable)
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh
@@ -7,6 +7,7 @@ test_description='Test rename detection in diff engine.
 
 '
 . ./test-lib.sh
+. ../diff-lib.sh
 
 echo >path0 'Line 1
 Line 2
@@ -27,25 +28,25 @@ Line 15
 
 test_expect_success \
     'update-cache --add a file.' \
-    'git-update-cache --add path0'
+    'git-update-index --add path0'
 
 test_expect_success \
     'write that tree.' \
-    'tree=$(git-write-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-cache --add --remove path0 path1'
+    'git-update-index --add --remove path0 path1'
 
 test_expect_success \
-    'git-diff-cache -p -M after rename and editing.' \
-    'git-diff-cache -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 old path0
-rename new path1
+rename from path0
+rename to path1
 --- a/path0
 +++ b/path1
 @@ -8,7 +8,7 @@ Line 7
@@ -61,6 +62,6 @@ EOF
 
 test_expect_success \
     'validate the output.' \
-    'diff -I "rename similarity.*" >/dev/null current expected'
+    'compare_diff_patch current expected'
 
 test_done