diff options
| author | Pete Wyckoff <pw@padd.com> | 2013-01-14 19:47:08 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-15 09:46:30 -0800 |
| commit | 44e8d26cf3fbc0795fb1c44f54f458847313d35e (patch) | |
| tree | 1153c0cdd67ff3773642d01d9cc04db814fd4180 /t/t9806-git-p4-options.sh | |
| parent | af8c0092503f677afc9ea4070ebd9204133b83ab (diff) | |
| download | git-44e8d26cf3fbc0795fb1c44f54f458847313d35e.tar.gz git-44e8d26cf3fbc0795fb1c44f54f458847313d35e.tar.xz | |
git p4: fix submit when no master branch
It finds its upstream and applies the commit properly, but
the sync step will fail unless it is told which branch to
work on.
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9806-git-p4-options.sh')
| -rwxr-xr-x | t/t9806-git-p4-options.sh | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/t/t9806-git-p4-options.sh b/t/t9806-git-p4-options.sh index 8d914a576..4f077eeca 100755 --- a/t/t9806-git-p4-options.sh +++ b/t/t9806-git-p4-options.sh @@ -251,6 +251,31 @@ test_expect_success 'clone --use-client-spec' ' ) ' +test_expect_success 'submit works with no p4/master' ' + test_when_finished cleanup_git && + git p4 clone --branch=b1 //depot@1,2 --destination="$git" && + ( + cd "$git" && + test_commit submit-1-branch && + git config git-p4.skipSubmitEdit true && + git p4 submit --branch=b1 + ) +' + +# The sync/rebase part post-submit will engage detect-branches +# machinery which will not do anything in this particular test. +test_expect_success 'submit works with two branches' ' + test_when_finished cleanup_git && + git p4 clone --branch=b1 //depot@1,2 --destination="$git" && + ( + cd "$git" && + git p4 sync --branch=b2 //depot@1,3 && + test_commit submit-2-branches && + git config git-p4.skipSubmitEdit true && + git p4 submit + ) +' + test_expect_success 'kill p4d' ' kill_p4d ' |