git-p4: unshelve uses HEAD^n, not HEAD~n
v3 cover git-p4: unshelve uses HEAD^n, not HEAD~n
Updated commits incorporating comments from Eric Sunshine, fixing indentation.
Luke Diamand (2):
git-p4: demonstrate unshelve bug
git-p4: fix unshelve bug finding parent commit
git-p4.py | 2 +- t/t9832-unshelve.sh | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-)
Signature · 1 line
2.28.0.762.g324f61785e
PATCH v3 1/2 git-p4: demonstrate `unshelve` bug
git-p4 unshelve uses HEAD^$n to find the parent commit, which fails if there is an additional commit. Augment the tests to demonstrate this problem.
--- t/t9832-unshelve.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
t/t9832-unshelve.sh +5 -2
@@ -29,8 +29,11 @@ test_expect_success 'init depot' ' ) ' +# Create an initial clone, with a commit unrelated to the P4 change +# on HEAD test_expect_success 'initial clone' ' - git p4 clone --dest="$git" //depot/@all + git p4 clone --dest="$git" //depot/@all && + test_commit -C "$git" "unrelated" ' test_expect_success 'create shelved changelist' '
@@ -77,7 +80,7 @@ EOF ) ' -test_expect_success 'update shelved changelist and re-unshelve' ' +test_expect_failure 'update shelved changelist and re-unshelve' ' test_when_finished cleanup_git && ( cd "$cli" &&
Signature · 1 line
2.28.0.762.g324f61785e
PATCH v3 2/2 git-p4: fix `unshelve` bug finding parent commit
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.
--- git-p4.py | 2 +- t/t9832-unshelve.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
git-p4.py +1 -1
@@ -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
t/t9832-unshelve.sh +1 -1
@@ -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" &&
Signature · 1 line
2.28.0.762.g324f61785e