git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* [PATCH 0/2] git-p4: unshelve uses HEAD^n, not HEAD~n
@ 2020-09-19  8:54 Luke Diamand
  2020-09-19  8:54 ` [PATCH 1/2] git-p4 unshelve: adding a commit breaks git-p4 unshelve Luke Diamand
  0 siblings, 1 reply; 5+ messages in thread
From: Luke Diamand @ 2020-09-19  8:54 UTC (permalink / raw)
  To: git; +Cc: Liu Xuhui (Jackson), Luke Diamand

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


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2020-09-20  5:35 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-19  8:54 [PATCH 0/2] git-p4: unshelve uses HEAD^n, not HEAD~n Luke Diamand
2020-09-19  8:54 ` [PATCH 1/2] git-p4 unshelve: adding a commit breaks git-p4 unshelve Luke Diamand
2020-09-19  8:54   ` [PATCH 2/2] git-p4: use HEAD~$n to find parent commit for unshelve Luke Diamand
2020-09-20  5:34     ` Eric Sunshine
2020-09-20  5:31   ` [PATCH 1/2] git-p4 unshelve: adding a commit breaks git-p4 unshelve Eric Sunshine

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).