diff options
| author | Luke Diamand <luke@diamand.org> | 2020-09-19 08:54:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-19 20:44:55 (GMT) |
| commit | 0acbf5997fa26747aec544d2ef6a27e4feb75e81 (patch) | |
| tree | bbaad706fe41e9d78a85b24fd42b87511f5ba0ad | |
| parent | 677fa8d1157c869974355e316d0e2349759d0325 (diff) | |
| download | git-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>
| -rwxr-xr-x | git-p4.py | 2 | ||||
| -rwxr-xr-x | t/t9832-unshelve.sh | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 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 @@ 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" && |