From: Robert Yang <liezhi.yang@windriver.com>
To: "Burton, Ross" <ross.burton@intel.com>,
Richard Tollerton <rich.tollerton@ni.com>
Cc: Ben Shelton <ben.shelton@ni.com>,
OE-core <openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH] create-pull-request: Fix error on 2.0 versions of git
Date: Fri, 17 Jul 2015 10:35:45 +0800 [thread overview]
Message-ID: <55A86A01.1060108@windriver.com> (raw)
In-Reply-To: <CAJTo0LZF6fogQd6YhTbkY9adXGOhiZONqwWLc909AUF4fBUapg@mail.gmail.com>
On 07/14/2015 05:49 PM, Burton, Ross wrote:
>
> On 13 July 2015 at 19:43, Richard Tollerton <rich.tollerton@ni.com
> <mailto:rich.tollerton@ni.com>> wrote:
>
> Ben Shelton <ben.shelton@ni.com <mailto:ben.shelton@ni.com>> writes:
>
> > On 2.0 versions of git, the create-pull-request script exits with the
> > warning "No match for commit... Are you sure you pushed 'HEAD' there?".
> >
> > This is due to a change in behavior where git used to guess the branch
> > you meant, but no longer does. See the thread at
> > http://www.spinics.net/lists/git/msg233050.html for more information.
> >
> > To accommodate the new behavior, if the COMMIT_ID is set to the default
> > of "HEAD", make it point explicitly to $BRANCH instead.
> >
> > Signed-off-by: Ben Shelton <ben.shelton@ni.com <mailto:ben.shelton@ni.com>>
>
> I still need to apply this patch in order to use create-pull-request.
> Bump?
>
>
> Not sure how this got missed, and I can't even find it in my archives, but it's
> queued now.
This patch breaks create-pull-request:
$ ./scripts/create-pull-request -u oe-contrib -b rbt/PU -r HEAD~5
fatal: ambiguous argument 'HEAD~5..rbt/PU': unknown revision or path not in the
working tree.
Use '--' to separate paths from revisions
fatal: Needed a single revision
ERROR: git request-pull reported an error
$ git --version
git version 1.7.9.5
Richard Tollerton, does Saul's fix work for you for git 2.0?
commit 5ffa98a95317e6bea436e4372b9202f4da0ce2ae
Author: Saul Wold <sgw@linux.intel.com>
Date: Tue Feb 3 09:08:29 2015 -0800
create-pull-request: Fix git request-pull
// Robert
>
> Ross
>
>
next prev parent reply other threads:[~2015-07-17 2:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-04 18:55 [PATCH] create-pull-request: Fix error on 2.0 versions of git Ben Shelton
2015-07-13 18:43 ` Richard Tollerton
2015-07-14 9:49 ` Burton, Ross
2015-07-17 2:35 ` Robert Yang [this message]
2015-07-17 16:39 ` Richard Tollerton
2015-07-17 16:50 ` Burton, Ross
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55A86A01.1060108@windriver.com \
--to=liezhi.yang@windriver.com \
--cc=ben.shelton@ni.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=rich.tollerton@ni.com \
--cc=ross.burton@intel.com \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox