`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@xxxxxxx>
Signed-off-by: Luke Diamand <luke@xxxxxxxxxxx>
---
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 c08234bea0..c2200a5b69 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.28.0.762.g324f61785e
