Merge branch 'cc/fix-missing-va-end-in-revert'
[gitweb.git] / t / t9807-git-p4-submit.sh
index b1f61e3db555cc939135d3c40b78300103bcc1eb..15417165e8900a87fbfbe54e757306e9070ea06f 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='git-p4 submit'
+test_description='git p4 submit'
 
 . ./lib-git-p4.sh
 
@@ -19,7 +19,7 @@ test_expect_success 'init depot' '
 
 test_expect_success 'submit with no client dir' '
        test_when_finished cleanup_git &&
-       "$GITP4" clone --dest="$git" //depot &&
+       git p4 clone --dest="$git" //depot &&
        (
                cd "$git" &&
                echo file2 >file2 &&
@@ -27,20 +27,20 @@ test_expect_success 'submit with no client dir' '
                git commit -m "git commit 2" &&
                rm -rf "$cli" &&
                git config git-p4.skipSubmitEdit true &&
-               "$GITP4" submit
+               git p4 submit
        )
 '
 
 # make two commits, but tell it to apply only from HEAD^
 test_expect_success 'submit --origin' '
        test_when_finished cleanup_git &&
-       "$GITP4" clone --dest="$git" //depot &&
+       git p4 clone --dest="$git" //depot &&
        (
                cd "$git" &&
                test_commit "file3" &&
                test_commit "file4" &&
                git config git-p4.skipSubmitEdit true &&
-               "$GITP4" submit --origin=HEAD^
+               git p4 submit --origin=HEAD^
        ) &&
        (
                cd "$cli" &&
@@ -52,30 +52,30 @@ test_expect_success 'submit --origin' '
 
 test_expect_success 'submit with allowSubmit' '
        test_when_finished cleanup_git &&
-       "$GITP4" clone --dest="$git" //depot &&
+       git p4 clone --dest="$git" //depot &&
        (
                cd "$git" &&
                test_commit "file5" &&
                git config git-p4.skipSubmitEdit true &&
                git config git-p4.allowSubmit "nobranch" &&
-               test_must_fail "$GITP4" submit &&
+               test_must_fail git p4 submit &&
                git config git-p4.allowSubmit "nobranch,master" &&
-               "$GITP4" submit
+               git p4 submit
        )
 '
 
 test_expect_success 'submit with master branch name from argv' '
        test_when_finished cleanup_git &&
-       "$GITP4" clone --dest="$git" //depot &&
+       git p4 clone --dest="$git" //depot &&
        (
                cd "$git" &&
                test_commit "file6" &&
                git config git-p4.skipSubmitEdit true &&
-               test_must_fail "$GITP4" submit nobranch &&
+               test_must_fail git p4 submit nobranch &&
                git branch otherbranch &&
                git reset --hard HEAD^ &&
                test_commit "file7" &&
-               "$GITP4" submit otherbranch
+               git p4 submit otherbranch
        ) &&
        (
                cd "$cli" &&