| Message ID | 20200919085441.7621-3-luke@diamand.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | git-p4: unshelve uses HEAD^n, not HEAD~n | expand |
On Sat, Sep 19, 2020 at 4:54 AM Luke Diamand <luke@diamand.org> wrote: > git-p4: use HEAD~$n to find parent commit for unshelve This commit message repeats what the patch itself says but doesn't explain why this change is being made or what problem is being solved. Some explanation to help readers understand the problem would be welcome. > Found-by: Liu Xuhui (Jackson) <Xuhui.Liu@amd.com> I believe this would generally be stated as Reported-by:. > Signed-off-by: Luke Diamand <luke@diamand.org>
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 feda4499dd..7194fb2855 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" &&
Found-by: Liu Xuhui (Jackson) <Xuhui.Liu@amd.com> Signed-off-by: Luke Diamand <luke@diamand.org> --- git-p4.py | 2 +- t/t9832-unshelve.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)