Merge branch 'rj/submodule-mswin-path'

diff --git a/t/t9805-git-p4-skip-submit-edit.sh b/t/t9805-git-p4-skip-submit-edit.sh
index df929e05558bbe84d78a35cedc273cb77b2d2c29..4a72f7952278eb5a92e0575c5c5c15fbe61d57b0 100755 (executable)
--- a/t/t9805-git-p4-skip-submit-edit.sh
+++ b/t/t9805-git-p4-skip-submit-edit.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='git-p4 skipSubmitEdit config variables'
+test_description='git p4 skipSubmitEdit config variables'
 
 . ./lib-git-p4.sh
 
@@ -19,33 +19,33 @@ test_expect_success 'init depot' '
 
 # this works because EDITOR is set to :
 test_expect_success 'no config, unedited, say yes' '
-       "$GITP4" clone --dest="$git" //depot &&
+       git p4 clone --dest="$git" //depot &&
        test_when_finished cleanup_git &&
        (
                cd "$git" &&
                echo line >>file1 &&
                git commit -a -m "change 2" &&
-               echo y | "$GITP4" submit &&
+               echo y | git p4 submit &&
                p4 changes //depot/... >wc &&
                test_line_count = 2 wc
        )
 '
 
 test_expect_success 'no config, unedited, say no' '
-       "$GITP4" clone --dest="$git" //depot &&
+       git p4 clone --dest="$git" //depot &&
        test_when_finished cleanup_git &&
        (
                cd "$git" &&
                echo line >>file1 &&
                git commit -a -m "change 3 (not really)" &&
-               printf "bad response\nn\n" | "$GITP4" submit &&
+               printf "bad response\nn\n" | git p4 submit &&
                p4 changes //depot/... >wc &&
                test_line_count = 2 wc
        )
 '
 
 test_expect_success 'skipSubmitEdit' '
-       "$GITP4" clone --dest="$git" //depot &&
+       git p4 clone --dest="$git" //depot &&
        test_when_finished cleanup_git &&
        (
                cd "$git" &&
@@ -54,21 +54,21 @@ test_expect_success 'skipSubmitEdit' '
                git config core.editor /bin/false &&
                echo line >>file1 &&
                git commit -a -m "change 3" &&
-               "$GITP4" submit &&
+               git p4 submit &&
                p4 changes //depot/... >wc &&
                test_line_count = 3 wc
        )
 '
 
 test_expect_success 'skipSubmitEditCheck' '
-       "$GITP4" clone --dest="$git" //depot &&
+       git p4 clone --dest="$git" //depot &&
        test_when_finished cleanup_git &&
        (
                cd "$git" &&
                git config git-p4.skipSubmitEditCheck true &&
                echo line >>file1 &&
                git commit -a -m "change 4" &&
-               "$GITP4" submit &&
+               git p4 submit &&
                p4 changes //depot/... >wc &&
                test_line_count = 4 wc
        )
@@ -76,7 +76,7 @@ test_expect_success 'skipSubmitEditCheck' '
 
 # check the normal case, where the template really is edited
 test_expect_success 'no config, edited' '
-       "$GITP4" clone --dest="$git" //depot &&
+       git p4 clone --dest="$git" //depot &&
        test_when_finished cleanup_git &&
        ed="$TRASH_DIRECTORY/ed.sh" &&
        test_when_finished "rm \"$ed\"" &&
@@ -91,7 +91,7 @@ test_expect_success 'no config, edited' '
                cd "$git" &&
                echo line >>file1 &&
                git commit -a -m "change 5" &&
-               EDITOR="\"$ed\"" "$GITP4" submit &&
+               EDITOR="\"$ed\"" git p4 submit &&
                p4 changes //depot/... >wc &&
                test_line_count = 5 wc
        )