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

diff --git a/t/t2101-update-index-reupdate.sh b/t/t2101-update-index-reupdate.sh
index a78ea7f0b0e4910407c75191fc683daaac1af2b6..59b560bfdf240e87516aadd6a31a2fe84e85d49a 100755 (executable)
--- a/t/t2101-update-index-reupdate.sh
+++ b/t/t2101-update-index-reupdate.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2006 Junio C Hamano
 #
 
-test_description='git-update-index --again test.
+test_description='git update-index --again test.
 '
 
 . ./test-lib.sh
@@ -15,29 +15,29 @@ EOF
 test_expect_success 'update-index --add' \
        'echo hello world >file1 &&
         echo goodbye people >file2 &&
-        git-update-index --add file1 file2 &&
-        git-ls-files -s >current &&
+        git update-index --add file1 file2 &&
+        git ls-files -s >current &&
         cmp current expected'
 
 test_expect_success 'update-index --again' \
        'rm -f file1 &&
        echo hello everybody >file2 &&
-       if git-update-index --again
+       if git update-index --again
        then
                echo should have refused to remove file1
                exit 1
        else
                echo happy - failed as expected
        fi &&
-        git-ls-files -s >current &&
+        git ls-files -s >current &&
         cmp current expected'
 
 cat > expected <<\EOF
 100644 0f1ae1422c2bf43f117d3dbd715c988a9ed2103f 0      file2
 EOF
 test_expect_success 'update-index --remove --again' \
-       'git-update-index --remove --again &&
-        git-ls-files -s >current &&
+       'git update-index --remove --again &&
+        git ls-files -s >current &&
         cmp current expected'
 
 test_expect_success 'first commit' 'git-commit -m initial'
@@ -50,11 +50,11 @@ test_expect_success 'update-index again' \
        'mkdir -p dir1 &&
        echo hello world >dir1/file3 &&
        echo goodbye people >file2 &&
-       git-update-index --add file2 dir1/file3 &&
+       git update-index --add file2 dir1/file3 &&
        echo hello everybody >file2
        echo happy >dir1/file3 &&
-       git-update-index --again &&
-       git-ls-files -s >current &&
+       git update-index --again &&
+       git ls-files -s >current &&
        cmp current expected'
 
 cat > expected <<\EOF
@@ -65,9 +65,9 @@ test_expect_success 'update-index --update from subdir' \
        'echo not so happy >file2 &&
        cd dir1 &&
        cat ../file2 >file3 &&
-       git-update-index --again &&
+       git update-index --again &&
        cd .. &&
-       git-ls-files -s >current &&
+       git ls-files -s >current &&
        cmp current expected'
 
 cat > expected <<\EOF
@@ -77,8 +77,8 @@ EOF
 test_expect_success 'update-index --update with pathspec' \
        'echo very happy >file2 &&
        cat file2 >dir1/file3 &&
-       git-update-index --again dir1/ &&
-       git-ls-files -s >current &&
+       git update-index --again dir1/ &&
+       git ls-files -s >current &&
        cmp current expected'
 
 test_done