From: Luke Diamand <luke@diamand.org>
To: git@vger.kernel.org
Cc: larsxschneider@gmail.com, Junio C Hamano <gitster@pobox.com>,
peff@peff.net, sunshine@sunshineco.com,
Luke Diamand <luke@diamand.org>
Subject: [PATCH v2 1/3] git-p4: add failing test for submit from detached head
Date: Sat, 21 Nov 2015 09:54:39 +0000 [thread overview]
Message-ID: <1448099681-20183-2-git-send-email-luke@diamand.org> (raw)
In-Reply-To: <1448099681-20183-1-git-send-email-luke@diamand.org>
git-p4 can't submit from a detached head. This test case
demonstrates the problem.
Signed-off-by: Luke Diamand <luke@diamand.org>
---
t/t9800-git-p4-basic.sh | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
index 90d41ed..114b19f 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_failure '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
'
--
2.6.0.rc3.238.gc07a1e8
next prev parent reply other threads:[~2015-11-21 9:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-21 9:54 [PATCH v2 0/2] git-p4: allow submission from detached head Luke Diamand
2015-11-21 9:54 ` Luke Diamand [this message]
2015-11-21 9:54 ` [PATCH v2 2/3] git-p4: add option to system() to return subshell status Luke Diamand
2015-11-21 9:54 ` [PATCH v2 3/3] git-p4: work with a detached head Luke Diamand
-- strict thread matches above, loose matches on Subject: below --
2015-11-07 1:07 [PATCH v2 0/2] git-p4: allow submission from " Luke Diamand
2015-11-07 1:07 ` [PATCH v2 1/3] git-p4: add failing test for submit " Luke Diamand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1448099681-20183-2-git-send-email-luke@diamand.org \
--to=luke@diamand.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=larsxschneider@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).