Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh
index b8acca1813955ca0034f7b2c0b9a12e3e2a4926f..ab5406dd9f241edee7a6067a1426f0a65076eb10 100755 (executable)
--- a/t/t4006-diff-mode.sh
+++ b/t/t4006-diff-mode.sh
@@ -11,24 +11,24 @@ test_description='Test mode change diffs.
 test_expect_success \
     'setup' \
     'echo frotz >rezrov &&
-     git-update-index --add rezrov &&
-     tree=`git-write-tree` &&
+     git update-index --add rezrov &&
+     tree=`git write-tree` &&
      echo $tree'
 
 if [ "$(git config --get core.filemode)" = false ]
 then
        say 'filemode disabled on the filesystem, using update-index --chmod=+x'
        test_expect_success \
-           'git-update-index --chmod=+x' \
-           'git-update-index rezrov &&
-            git-update-index --chmod=+x rezrov &&
-            git-diff-index $tree >current'
+           'git update-index --chmod=+x' \
+           'git update-index rezrov &&
+            git update-index --chmod=+x rezrov &&
+            git diff-index $tree >current'
 else
        test_expect_success \
            'chmod' \
            'chmod +x rezrov &&
-            git-update-index rezrov &&
-            git-diff-index $tree >current'
+            git update-index rezrov &&
+            git diff-index $tree >current'
 fi
 
 _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'