git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Luke Diamand <luke@diamand.org>
To: "Liu, Xuhui (Jackson)" <Xuhui.Liu@amd.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Bug Report: git-p4 unshelve failed
Date: Wed, 16 Sep 2020 13:59:59 +0100	[thread overview]
Message-ID: <CAE5ih79z8z+rmg-ncT6=RLaySr8GjxS5B33+yDh6bNC4TkUQDA@mail.gmail.com> (raw)
In-Reply-To: <DM6PR12MB3194C9B3A462968FA5A05B4CFA200@DM6PR12MB3194.namprd12.prod.outlook.com>

On Tue, 15 Sep 2020 at 02:09, Liu, Xuhui (Jackson) <Xuhui.Liu@amd.com> 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

      reply	other threads:[~2020-09-16 20:50 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-15  1:09 Bug Report: git-p4 unshelve failed Liu, Xuhui (Jackson)
2020-09-16 12:59 ` Luke Diamand [this message]

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='CAE5ih79z8z+rmg-ncT6=RLaySr8GjxS5B33+yDh6bNC4TkUQDA@mail.gmail.com' \
    --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).