git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Luke Diamand <luke@diamand.org>
To: git@vger.kernel.org
Cc: "Liu Xuhui (Jackson)" <Xuhui.Liu@amd.com>,
	Luke Diamand <luke@diamand.org>
Subject: [PATCH 1/2] git-p4 unshelve: adding a commit breaks git-p4 unshelve
Date: Sat, 19 Sep 2020 09:54:40 +0100	[thread overview]
Message-ID: <20200919085441.7621-2-luke@diamand.org> (raw)
In-Reply-To: <20200919085441.7621-1-luke@diamand.org>

git-p4 unshelve uses HEAD^$n to find the parent commit, which
fails if there is an additional commit.

Signed-off-by: Luke Diamand <luke@diamand.org>
---
 t/t9832-unshelve.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh
index e9276c48f4..feda4499dd 100755
--- a/t/t9832-unshelve.sh
+++ b/t/t9832-unshelve.sh
@@ -29,8 +29,11 @@ test_expect_success 'init depot' '
 	)
 '
 
+# Create an initial clone, with a commit unrelated to the P4 change
+# on HEAD
 test_expect_success 'initial clone' '
-	git p4 clone --dest="$git" //depot/@all
+	git p4 clone --dest="$git" //depot/@all &&
+    test_commit -C "$git" "unrelated"
 '
 
 test_expect_success 'create shelved changelist' '
@@ -77,7 +80,7 @@ EOF
 	)
 '
 
-test_expect_success 'update shelved changelist and re-unshelve' '
+test_expect_failure 'update shelved changelist and re-unshelve' '
 	test_when_finished cleanup_git &&
 	(
 		cd "$cli" &&
-- 
2.28.0


  reply	other threads:[~2020-09-19  8:54 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-19  8:54 [PATCH 0/2] git-p4: unshelve uses HEAD^n, not HEAD~n Luke Diamand
2020-09-19  8:54 ` Luke Diamand [this message]
2020-09-19  8:54   ` [PATCH 2/2] git-p4: use HEAD~$n to find parent commit for unshelve Luke Diamand
2020-09-20  5:34     ` Eric Sunshine
2020-09-20  5:31   ` [PATCH 1/2] git-p4 unshelve: adding a commit breaks git-p4 unshelve Eric Sunshine

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=20200919085441.7621-2-luke@diamand.org \
    --to=luke@diamand.org \
    --cc=Xuhui.Liu@amd.com \
    --cc=git@vger.kernel.org \
    --subject='Re: [PATCH 1/2] git-p4 unshelve: adding a commit breaks git-p4 unshelve' \
    /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

Code repositories for project(s) associated with this 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).