From: Luke Diamand <luke@diamand.org>
To: git@vger.kernel.org
Cc: "Liu Xuhui (Jackson)" <Xuhui.Liu@amd.com>,
Eric Sunshine <sunshine@sunshineco.com>,
Luke Diamand <luke@diamand.org>
Subject: [PATCHv2 2/2] git-p4: fix `unshelve` bug finding parent commit
Date: Sun, 20 Sep 2020 08:48:41 +0100 [thread overview]
Message-ID: <20200920074841.17043-3-luke@diamand.org> (raw)
In-Reply-To: <20200920074841.17043-2-luke@diamand.org>
`unshelve` was using HEAD^$n to find the parent commit. This meant that
any intervening commits between HEAD and the last git-p4 commit would
cause the unshelve to fail.
e.g.
123ab Local git-only commit
234bc Another local git-only commit
345cd Perforce tip revision
Unshelve needs to find 345cd.
Use HEAD~$n instead.
Reported-by: Liu Xuhui (Jackson) <Xuhui.Liu@amd.com>
Signed-off-by: Luke Diamand <luke@diamand.org>
---
git-p4.py | 2 +-
t/t9832-unshelve.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index ca79dc0900..4433ca53de 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -4237,7 +4237,7 @@ def findLastP4Revision(self, starting_point):
"""
for parent in (range(65535)):
- log = extractLogMessageFromGitCommit("{0}^{1}".format(starting_point, parent))
+ log = extractLogMessageFromGitCommit("{0}~{1}".format(starting_point, parent))
settings = extractSettingsGitLog(log)
if 'change' in settings:
return settings
diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh
index feda4499dd..7194fb2855 100755
--- a/t/t9832-unshelve.sh
+++ b/t/t9832-unshelve.sh
@@ -80,7 +80,7 @@ EOF
)
'
-test_expect_failure 'update shelved changelist and re-unshelve' '
+test_expect_success 'update shelved changelist and re-unshelve' '
test_when_finished cleanup_git &&
(
cd "$cli" &&
--
2.20.1.390.gb5101f9297
next prev parent reply other threads:[~2020-09-20 7:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-20 7:48 [PATCHv2 0/2] git-p4: unshelve uses HEAD^n, not HEAD~n Luke Diamand
2020-09-20 7:48 ` [PATCHv2 1/2] git-p4: demonstrate `unshelve` bug Luke Diamand
2020-09-20 7:48 ` Luke Diamand [this message]
2020-09-20 8:40 ` 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=20200920074841.17043-3-luke@diamand.org \
--to=luke@diamand.org \
--cc=Xuhui.Liu@amd.com \
--cc=git@vger.kernel.org \
--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).