On Tue, 15 Sep 2020 at 02:09, Liu, Xuhui (Jackson) <Xuhui.Liu@xxxxxxx> wrote: > > Hi Git, > When I use "git p4 unshelve 4495953", it failed. > I have fixed this issue locally. You can check the attached for details. > > What have I done to fix this: > It's because the line#4240 in function "findLastP4Revision" of git-p4.py: > log = extractLogMessageFromGitCommit("{0}^{1}".format(starting_point, parent)) > I think it should be: > log = extractLogMessageFromGitCommit("{0}~{1}".format(starting_point, parent)) > > Best Regards, > Jackson(Xuhui) Liu This is indeed a bug. I will see if I can put together a patch. Thanks Luke