Re: rebase from ambiguous ref discards changes

On Fri, Sep 07, 2007 at 02:58:18AM +0000, Keith Packard wrote:

On Thu, 2007-09-06 at 16:26 -0700, Junio C Hamano wrote:

quoted

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

oops.

$ find .git -name master
..git/master
..git/refs/heads/master
..git/refs/remotes/kyle/master
..git/refs/remotes/origin/master
..git/refs/remotes/otc/master
..git/logs/refs/heads/master
..git/logs/refs/remotes/fdo/master
..git/logs/refs/remotes/kyle/master
..git/logs/refs/remotes/origin/master
..git/logs/refs/remotes/otc/master

So, I think that explains where the ambiguous master came from.  Seems
like rebase should be able to bail out before breaking things though.

  Actually if I get this right, it didn't broke anything, it just
rebased your ".git/master" :) It just chose the wrong desambiguation for
some reason.



-- 
·O·  Pierre Habouzit
··O                                                madcoder@debian.org
OOO                                                http://www.madism.org