Merge branch 'jc/add-refresh-unmerged' into maint

[git.git] / t / t9807-git-p4-submit.sh

diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh
index 2cb724e14c081a236a0a45a6fd4c5b23f2372d35..b1f61e3db555cc939135d3c40b78300103bcc1eb 100755 (executable)
--- a/t/t9807-git-p4-submit.sh
+++ b/t/t9807-git-p4-submit.sh
@@ -31,6 +31,60 @@ test_expect_success 'submit with no client dir' '
        )
 '
 
+# 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 &&
+       (
+               cd "$git" &&
+               test_commit "file3" &&
+               test_commit "file4" &&
+               git config git-p4.skipSubmitEdit true &&
+               "$GITP4" submit --origin=HEAD^
+       ) &&
+       (
+               cd "$cli" &&
+               p4 sync &&
+               test_path_is_missing "file3.t" &&
+               test_path_is_file "file4.t"
+       )
+'
+
+test_expect_success 'submit with allowSubmit' '
+       test_when_finished cleanup_git &&
+       "$GITP4" 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 &&
+               git config git-p4.allowSubmit "nobranch,master" &&
+               "$GITP4" submit
+       )
+'
+
+test_expect_success 'submit with master branch name from argv' '
+       test_when_finished cleanup_git &&
+       "$GITP4" clone --dest="$git" //depot &&
+       (
+               cd "$git" &&
+               test_commit "file6" &&
+               git config git-p4.skipSubmitEdit true &&
+               test_must_fail "$GITP4" submit nobranch &&
+               git branch otherbranch &&
+               git reset --hard HEAD^ &&
+               test_commit "file7" &&
+               "$GITP4" submit otherbranch
+       ) &&
+       (
+               cd "$cli" &&
+               p4 sync &&
+               test_path_is_file "file6.t" &&
+               test_path_is_missing "file7.t"
+       )
+'
+
 test_expect_success 'kill p4d' '
        kill_p4d
 '