[PATCH 0/2] git-p4: unshelve uses HEAD^n, not HEAD~n
- From
Luke Diamand <luke@diamand.org>
- Date
- Sep 19, 2020, 08:54 UTC
- Message-ID
- <20200919085441.7621-1-luke@diamand.org>
Jackson(Xuhui) Liu found that git-p4 unshelve fails, and suggested a fix.
I have updated the tests to spot the error, and added his suggested fix, which also works for me.
Luke Diamand (2): git-p4 unshelve: adding a commit breaks git-p4 unshelve git-p4: use HEAD~$n to find parent commit for unshelve
git-p4.py | 2 +- t/t9832-unshelve.sh | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-)
-- 2.28.0