Merge branch 'master' of git://repo.or.cz/git-gui

diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh
index 1e8f9e59dfe7e63177dea0a2e4b5c018a4756994..b9cef3422c3ba1392b32ec66f72dc4b7c34f4a43 100755 (executable)
--- a/t/t1020-subdirectory.sh
+++ b/t/t1020-subdirectory.sh
@@ -22,19 +22,19 @@ LF='
 
 test_expect_success 'update-index and ls-files' '
        cd $HERE &&
-       git-update-index --add one &&
-       case "`git-ls-files`" in
+       git update-index --add one &&
+       case "`git ls-files`" in
        one) echo ok one ;;
        *) echo bad one; exit 1 ;;
        esac &&
        cd dir &&
-       git-update-index --add two &&
-       case "`git-ls-files`" in
+       git update-index --add two &&
+       case "`git ls-files`" in
        two) echo ok two ;;
        *) echo bad two; exit 1 ;;
        esac &&
        cd .. &&
-       case "`git-ls-files`" in
+       case "`git ls-files`" in
        dir/two"$LF"one) echo ok both ;;
        *) echo bad; exit 1 ;;
        esac
@@ -42,13 +42,13 @@ test_expect_success 'update-index and ls-files' '
 
 test_expect_success 'cat-file' '
        cd $HERE &&
-       two=`git-ls-files -s dir/two` &&
+       two=`git ls-files -s dir/two` &&
        two=`expr "$two" : "[0-7]* \\([0-9a-f]*\\)"` &&
        echo "$two" &&
-       git-cat-file -p "$two" >actual &&
+       git cat-file -p "$two" >actual &&
        cmp dir/two actual &&
        cd dir &&
-       git-cat-file -p "$two" >actual &&
+       git cat-file -p "$two" >actual &&
        cmp two actual
 '
 rm -f actual dir/actual
@@ -57,17 +57,17 @@ test_expect_success 'diff-files' '
        cd $HERE &&
        echo a >>one &&
        echo d >>dir/two &&
-       case "`git-diff-files --name-only`" in
+       case "`git diff-files --name-only`" in
        dir/two"$LF"one) echo ok top ;;
        *) echo bad top; exit 1 ;;
        esac &&
        # diff should not omit leading paths
        cd dir &&
-       case "`git-diff-files --name-only`" in
+       case "`git diff-files --name-only`" in
        dir/two"$LF"one) echo ok subdir ;;
        *) echo bad subdir; exit 1 ;;
        esac &&
-       case "`git-diff-files --name-only .`" in
+       case "`git diff-files --name-only .`" in
        dir/two) echo ok subdir limited ;;
        *) echo bad subdir limited; exit 1 ;;
        esac
@@ -75,33 +75,33 @@ test_expect_success 'diff-files' '
 
 test_expect_success 'write-tree' '
        cd $HERE &&
-       top=`git-write-tree` &&
+       top=`git write-tree` &&
        echo $top &&
        cd dir &&
-       sub=`git-write-tree` &&
+       sub=`git write-tree` &&
        echo $sub &&
        test "z$top" = "z$sub"
 '
 
 test_expect_success 'checkout-index' '
        cd $HERE &&
-       git-checkout-index -f -u one &&
+       git checkout-index -f -u one &&
        cmp one original.one &&
        cd dir &&
-       git-checkout-index -f -u two &&
+       git checkout-index -f -u two &&
        cmp two ../original.two
 '
 
 test_expect_success 'read-tree' '
        cd $HERE &&
        rm -f one dir/two &&
-       tree=`git-write-tree` &&
-       git-read-tree --reset -u "$tree" &&
+       tree=`git write-tree` &&
+       git read-tree --reset -u "$tree" &&
        cmp one original.one &&
        cmp dir/two original.two &&
        cd dir &&
        rm -f two &&
-       git-read-tree --reset -u "$tree" &&
+       git read-tree --reset -u "$tree" &&
        cmp two ../original.two &&
        cmp ../one ../original.one
 '