diff options
| author |  Luke Diamand <luke@diamand.org> | 2015-11-21 09:54:41 +0000 |
|---|---|---|
| committer |  Jeff King <peff@peff.net> | 2015-11-24 15:20:15 -0500 |
| commit | 00ad6e3182bbe68a94eaedf322918e4f266d184f (patch) | |
| tree | 897f3591a23a7fcbc222b052ff6502005b618028 /t | |
| parent | git-p4: add option to system() to return subshell status (diff) | |
| download | tgif-00ad6e3182bbe68a94eaedf322918e4f266d184f.tar.xz | |
git-p4: work with a detached head
When submitting, git-p4 finds the current branch in
order to know if it is allowed to submit (configuration
"git-p4.allowSubmit").
On a detached head, detecting the branch would fail, and
git-p4 would report a cryptic error.
This change teaches git-p4 to recognise a detached head and
submit successfully.
Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9800-git-p4-basic.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh index 114b19fca8..0730f18d0f 100755 --- a/t/t9800-git-p4-basic.sh +++ b/t/t9800-git-p4-basic.sh @@ -241,7 +241,7 @@ test_expect_success 'unresolvable host in P4PORT should display error' ' ) ' -test_expect_failure 'submit from detached head' ' +test_expect_success 'submit from detached head' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && ( |