builtin-replace: teach "git replace" to actually replace

diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh
index 90fd21ff1f0fd892b649e0b2fc73844e14cb0ee2..8c1b81e248bced2ccb5e4ff0067996462e89deb8 100755 (executable)
--- a/t/t4006-diff-mode.sh
+++ b/t/t4006-diff-mode.sh
@@ -11,15 +11,14 @@ test_description='Test mode change diffs.
 test_expect_success \
     'setup' \
     'echo frotz >rezrov &&
-     git-update-cache --add rezrov &&
-     tree=`git-write-tree` &&
+     git update-index --add rezrov &&
+     tree=`git write-tree` &&
      echo $tree'
 
 test_expect_success \
     'chmod' \
-    'chmod +x rezrov &&
-     git-update-cache rezrov &&
-     git-diff-cache $tree >current'
+    'test_chmod +x rezrov &&
+     git diff-index $tree >current'
 
 _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
 _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
@@ -28,7 +27,6 @@ echo ":100644 100755 X X M    rezrov" >expected
 
 test_expect_success \
     'verify' \
-    'diff -u expected check'
+    'test_cmp expected check'
 
 test_done
-