Re: rebase from ambiguous ref discards changes

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 6, 2007, 23:26 UTC
Message-ID: <7vsl5r8jer.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <1189115308.30308.9.camel@koto.keithp.com>

Keith Packard <keithp@keithp.com> writes:

Show 19 quoted lines

> So, I started with a very simple repository
>
> ---*--- master
>     \
>      -- origin/master
>
> From master, I did
>
> $ git-rebase origin/master
> warning: refname 'master' is ambiguous.
> First, rewinding head to replay your work on top of it...
> HEAD is now at 2a8592f... Fix G33 GTT stolen mem range
> Fast-forwarded master to origin/master.
> ...
> Seems like there's something going on when 'master' is ambiguous, or
> perhaps some other problem.
>
> This is all from version 1.5.3, but I think I've seen this on 1.5.2 as
> well.

We haven't touched this area for a long time (like "v1.3.0" or "since March 2006"). I wish you told us about this earlier.

I'd like to reproduce this, but I need to be sure what your "ambiguous" situation is really like. What ambiguous "master"s do you have? IOW, what does:

	git show-ref | grep master

say? I have 11 lines of output from the above and I have never seen a problem like this.

Perhaps you have ".git/master" by mistake?