commit 0acbf5997fa26747aec544d2ef6a27e4feb75e81
author Luke Diamand <luke@diamand.org> Sat Sep 19 09:54:41 2020 +0100
committer Junio C Hamano <gitster@pobox.com> Sat Sep 19 13:44:55 2020 -0700
tree bbaad706fe41e9d78a85b24fd42b87511f5ba0ad
parent 677fa8d1157c869974355e316d0e2349759d0325

git-p4: use HEAD~$n to find parent commit for unshelve

Found-by: Liu Xuhui (Jackson) <Xuhui.Liu@amd.com>
Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-p4.py

diff --git a/git-p4.py b/git-p4.py
index ca79dc0..4433ca5 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -4237,7 +4237,7 @@
         """
 
         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

t/t9832-unshelve.sh

diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh
index feda449..7194fb2 100755
--- a/t/t9832-unshelve.sh
+++ b/t/t9832-unshelve.sh
@@ -80,7 +80,7 @@
 	)
 '
 
-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" &&