git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Luke Diamand <luke@diamand.org>
To: git@vger.kernel.org
Cc: "Liu Xuhui (Jackson)" <Xuhui.Liu@amd.com>,
	Luke Diamand <luke@diamand.org>
Subject: [PATCH 0/2] git-p4: unshelve uses HEAD^n, not HEAD~n
Date: Sat, 19 Sep 2020 09:54:39 +0100	[thread overview]
Message-ID: <20200919085441.7621-1-luke@diamand.org> (raw)

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


             reply	other threads:[~2020-09-19  8:54 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-19  8:54 Luke Diamand [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200919085441.7621-1-luke@diamand.org \
    --to=luke@diamand.org \
    --cc=Xuhui.Liu@amd.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public 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).