diff options
| author | Jeff King <peff@peff.net> | 2015-12-01 22:21:29 (GMT) |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2015-12-01 22:21:29 (GMT) |
| commit | 5b228f956a8f7ec5127adf9e9368220d7e5d9a5e (patch) | |
| tree | f1d95645e32410c8402194a084483c4f8948c073 /t | |
| parent | 978b5760a11846ee7e2b928aca629a065a9d876d (diff) | |
| parent | 00ad6e3182bbe68a94eaedf322918e4f266d184f (diff) | |
| download | git-5b228f956a8f7ec5127adf9e9368220d7e5d9a5e.zip git-5b228f956a8f7ec5127adf9e9368220d7e5d9a5e.tar.gz git-5b228f956a8f7ec5127adf9e9368220d7e5d9a5e.tar.bz2 | |
Merge branch 'ld/p4-detached-head' into maint
Make git-p4 work on a detached head.
* ld/p4-detached-head:
git-p4: work with a detached head
git-p4: add option to system() to return subshell status
git-p4: add failing test for submit from detached head
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9800-git-p4-basic.sh | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh index 90d41ed..0730f18 100755 --- a/t/t9800-git-p4-basic.sh +++ b/t/t9800-git-p4-basic.sh @@ -241,6 +241,22 @@ test_expect_success 'unresolvable host in P4PORT should display error' ' ) ' +test_expect_success 'submit from detached head' ' + test_when_finished cleanup_git && + git p4 clone --dest="$git" //depot && + ( + cd "$git" && + git checkout p4/master && + >detached_head_test && + git add detached_head_test && + git commit -m "add detached_head" && + git config git-p4.skipSubmitEdit true && + git p4 submit && + git p4 rebase && + git log p4/master | grep detached_head + ) +' + test_expect_success 'kill p4d' ' kill_p4d ' |