From: John Keeping <john@keeping.me.uk>
To: Siddharth Agarwal <sid0@fb.com>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: Re: with git-next, git pull --rebase can print out "fatal: No such ref: ''" for branches without an upstream
Date: Fri, 17 Jan 2014 08:40:10 +0000 [thread overview]
Message-ID: <20140117084010.GL7608@serenity.lan> (raw)
In-Reply-To: <52D899CA.5050409@fb.com>
On Thu, Jan 16, 2014 at 06:47:38PM -0800, Siddharth Agarwal wrote:
> On 01/16/2014 06:21 PM, Jeff King wrote:
> > On Thu, Jan 16, 2014 at 05:08:14PM -0800, Siddharth Agarwal wrote:
> >
> >> With git-next, where git pull --rebase can print out "fatal: No such
> >> ref: ''" if git pull --rebase is run on branches without an upstream.
> > This is already fixed in bb3f458 (rebase: fix fork-point with zero
> > arguments, 2014-01-09), I think.
>
> If I'm reading the patch correctly, that only fixes it for git rebase,
> not for git pull --rebase. git-pull.sh contains a separate invocation of
> git merge-base --fork-point.
I'm pretty sure the invocation in git-pull.sh is OK. The error then
comes out of git-rebase.sh when git-pull invokes it.
Are you running a version of git-next that includes bb3f458?
next prev parent reply other threads:[~2014-01-17 8:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-17 1:08 with git-next, git pull --rebase can print out "fatal: No such ref: ''" for branches without an upstream Siddharth Agarwal
2014-01-17 2:21 ` Jeff King
2014-01-17 2:47 ` Siddharth Agarwal
2014-01-17 8:40 ` John Keeping [this message]
2014-01-17 18:09 ` Siddharth Agarwal
2014-01-17 18:57 ` Junio C Hamano
2014-01-17 19:26 ` John Keeping
2014-01-17 20:00 ` [PATCH] pull: suppress error when no remoteref is found John Keeping
2014-01-17 20:02 ` with git-next, git pull --rebase can print out "fatal: No such ref: ''" for branches without an upstream Junio C Hamano
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=20140117084010.GL7608@serenity.lan \
--to=john@keeping.me.uk \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=sid0@fb.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.