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>
Luke Diamand committed
Sep 19, 2020 at 09:54 UTC
0acbf5997fa26747aec544d2ef6a27e4feb75e81
2 files changed
+2
-2
git-p4.py
+1
-1
@@ -4237,7 +4237,7 @@ class P4Unshelve(Command):
4237
"""
4238
4239
for parent in (range(65535)):
4240
- log = extractLogMessageFromGitCommit("{0}^{1}".format(starting_point, parent))
4240
+ log = extractLogMessageFromGitCommit("{0}~{1}".format(starting_point, parent))
4241
settings = extractSettingsGitLog(log)
4242
if 'change' in settings:
4243
return settings
t/t9832-unshelve.sh
+1
-1
@@ -80,7 +80,7 @@ EOF
80
)
81
'
82
83
-test_expect_failure 'update shelved changelist and re-unshelve' '
83
+test_expect_success 'update shelved changelist and re-unshelve' '
84
test_when_finished cleanup_git &&
85
(
86
cd "$cli" &&