Git development
 help / color / mirror / Atom feed
From: John Keeping <john@keeping.me.uk>
To: Andreas Krey <a.krey@gmx.de>
Cc: git <git@vger.kernel.org>
Subject: Re: [BUG] "git rebase": fatal: Not a valid object name: ''
Date: Thu, 9 Jan 2014 15:56:21 +0000	[thread overview]
Message-ID: <20140109155620.GH7608@serenity.lan> (raw)
In-Reply-To: <20140109153618.GA18975@inner.h.apk.li>

On Thu, Jan 09, 2014 at 04:36:18PM +0100, Andreas Krey wrote:
> since ad8261d (rebase: use reflog to find common base with upstream)
> a rebase without arguments says "fatal: Not a valid object name: ''",
> caused by trying to determine the fork point with an empty $switch_to.
> 
> I don't really see what the appropriate fix would be. :-(

I think the correct fix is to change the "$switch_to" in the call to
"git merge-base --fork-point" to "${switch_to:-HEAD}", but I'm not at a
machine where I can test that or work up a patch at the moment...

  reply	other threads:[~2014-01-09 16:03 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-09 15:05 [BUG] git symbolic-ref does not recognize @ as the shortcut for HEAD Mathieu Lemoine
2014-01-09 15:36 ` [BUG] "git rebase": fatal: Not a valid object name: '' Andreas Krey
2014-01-09 15:56   ` John Keeping [this message]
2014-01-09 16:06     ` Andreas Krey
2014-01-09 19:47       ` [PATCH] rebase: fix fork-point with zero arguments John Keeping
2014-01-15 11:26 ` [BUG] git symbolic-ref does not recognize @ as the shortcut for HEAD Duy Nguyen

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=20140109155620.GH7608@serenity.lan \
    --to=john@keeping.me.uk \
    --cc=a.krey@gmx.de \
    --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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox