t3409 t4107 t7406 t9150: use dashless commands

This is needed to allow test suite to run against a standard
install bin directory instead of GIT_EXEC_PATH.

Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t3409-rebase-preserve-merges.sh b/t/t3409-rebase-preserve-merges.sh
index 297d165476b93e18b18bf42bc81f4740cf18db9f..8f785e7957519eaa3dd1ef946c905054c4fa0e6c 100755 (executable)
--- a/t/t3409-rebase-preserve-merges.sh
+++ b/t/t3409-rebase-preserve-merges.sh
@@ -32,14 +32,14 @@ export GIT_AUTHOR_EMAIL
 test_expect_success 'setup for merge-preserving rebase' \
        'echo First > A &&
        git add A &&
 test_expect_success 'setup for merge-preserving rebase' \
        'echo First > A &&
        git add A &&

-       git-commit -m "Add A1" &&
+       git commit -m "Add A1" &&

        git checkout -b topic &&
        echo Second > B &&
        git add B &&
        git checkout -b topic &&
        echo Second > B &&
        git add B &&

-       git-commit -m "Add B1" &&
+       git commit -m "Add B1" &&

        git checkout -f master &&
        echo Third >> A &&
        git checkout -f master &&
        echo Third >> A &&

-       git-commit -a -m "Modify A2" &&
+       git commit -a -m "Modify A2" &&

 
        git clone ./. clone1 &&
        cd clone1 &&
 
        git clone ./. clone1 &&
        cd clone1 &&

diff --git a/t/t4107-apply-ignore-whitespace.sh b/t/t4107-apply-ignore-whitespace.sh
index 484654d6e49a170975a36efe9c27d7884c4bce5d..b04fc8fc12238c3326306ed0e055b7d67bf950b4 100755 (executable)
--- a/t/t4107-apply-ignore-whitespace.sh
+++ b/t/t4107-apply-ignore-whitespace.sh
@@ -136,37 +136,37 @@ void print_int(int num) {
 EOF
 
 test_expect_success 'file creation' '
 EOF
 
 test_expect_success 'file creation' '

-       git-apply patch1.patch
+       git apply patch1.patch

 '
 
 test_expect_success 'patch2 fails (retab)' '
 '
 
 test_expect_success 'patch2 fails (retab)' '

-       test_must_fail git-apply patch2.patch
+       test_must_fail git apply patch2.patch

 '
 
 test_expect_success 'patch2 applies with --ignore-whitespace' '
 '
 
 test_expect_success 'patch2 applies with --ignore-whitespace' '

-       git-apply --ignore-whitespace patch2.patch
+       git apply --ignore-whitespace patch2.patch

 '
 
 test_expect_success 'patch2 reverse applies with --ignore-space-change' '
 '
 
 test_expect_success 'patch2 reverse applies with --ignore-space-change' '

-       git-apply -R --ignore-space-change patch2.patch
+       git apply -R --ignore-space-change patch2.patch

 '
 
 git config apply.ignorewhitespace change
 
 test_expect_success 'patch2 applies (apply.ignorewhitespace = change)' '
 '
 
 git config apply.ignorewhitespace change
 
 test_expect_success 'patch2 applies (apply.ignorewhitespace = change)' '

-       git-apply patch2.patch
+       git apply patch2.patch

 '
 
 test_expect_success 'patch3 fails (missing string at EOL)' '
 '
 
 test_expect_success 'patch3 fails (missing string at EOL)' '

-       test_must_fail git-apply patch3.patch
+       test_must_fail git apply patch3.patch

 '
 
 test_expect_success 'patch4 fails (missing EOL at EOF)' '
 '
 
 test_expect_success 'patch4 fails (missing EOL at EOF)' '

-       test_must_fail git-apply patch4.patch
+       test_must_fail git apply patch4.patch

 '
 
 test_expect_success 'patch5 applies (leading whitespace)' '
 '
 
 test_expect_success 'patch5 applies (leading whitespace)' '

-       git-apply patch5.patch
+       git apply patch5.patch

 '
 
 test_expect_success 'patches do not mangle whitespace' '
 '
 
 test_expect_success 'patches do not mangle whitespace' '


@@ -175,11 +175,11 @@ test_expect_success 'patches do not mangle whitespace' '
 
 test_expect_success 're-create file (with --ignore-whitespace)' '
        rm -f main.c &&
 
 test_expect_success 're-create file (with --ignore-whitespace)' '
        rm -f main.c &&

-       git-apply patch1.patch
+       git apply patch1.patch

 '
 
 test_expect_success 'patch5 fails (--no-ignore-whitespace)' '
 '
 
 test_expect_success 'patch5 fails (--no-ignore-whitespace)' '

-       test_must_fail git-apply --no-ignore-whitespace patch5.patch
+       test_must_fail git apply --no-ignore-whitespace patch5.patch

 '
 
 test_done
 '
 
 test_done

diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 2d33d9efec3f2f601305e736e31368621acd0584..8e2449d24409bab14558f83617f651c3f7255627 100755 (executable)
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -14,8 +14,8 @@ submodule and "git submodule update --rebase/--merge" does not detach the HEAD.
 
 compare_head()
 {
 
 compare_head()
 {

-    sha_master=`git-rev-list --max-count=1 master`
-    sha_head=`git-rev-list --max-count=1 HEAD`
+    sha_master=`git rev-list --max-count=1 master`
+    sha_head=`git rev-list --max-count=1 HEAD`

 
     test "$sha_master" = "$sha_head"
 }
 
     test "$sha_master" = "$sha_head"
 }

diff --git a/t/t9150-svk-mergetickets.sh b/t/t9150-svk-mergetickets.sh
index dd0c2bad24db26abdab7a91acee109978421ea3e..53581425c4b5cd8e7b35b41605511d52d005e8d6 100755 (executable)
--- a/t/t9150-svk-mergetickets.sh
+++ b/t/t9150-svk-mergetickets.sh
@@ -18,7 +18,7 @@ test_expect_success 'load svk depot' "
 uuid=b48289b2-9c08-4d72-af37-0358a40b9c15
 
 test_expect_success 'svk merges were represented coming in' "
 uuid=b48289b2-9c08-4d72-af37-0358a40b9c15
 
 test_expect_success 'svk merges were represented coming in' "

-       [ `git-cat-file commit HEAD | grep parent | wc -l` -eq 2 ]
+       [ `git cat-file commit HEAD | grep parent | wc -l` -eq 2 ]

        "
 
 test_done
        "
 
 test_done