summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorLuke Diamand <luke@diamand.org>2020-09-19 08:54:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-09-19 20:44:55 (GMT)
commit0acbf5997fa26747aec544d2ef6a27e4feb75e81 (patch)
treebbaad706fe41e9d78a85b24fd42b87511f5ba0ad /git-p4.py
parent677fa8d1157c869974355e316d0e2349759d0325 (diff)
downloadgit-0acbf5997fa26747aec544d2ef6a27e4feb75e81.zip
git-0acbf5997fa26747aec544d2ef6a27e4feb75e81.tar.gz
git-0acbf5997fa26747aec544d2ef6a27e4feb75e81.tar.bz2
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>
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py2
1 files changed, 1 insertions, 1 deletions
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 @@ class P4Unshelve(Command):
"""
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