Re: git rebase chokes on directory -> symlink -> directory

From: Alex Riesen <raa.lkml@gmail.com>
Date: May 9, 2007, 21:39 UTC
Message-ID: <20070509213902.GA2593@steel.home>
In-Reply-To: <4641FDAF.3090608@zytor.com>

H. Peter Anvin, Wed, May 09, 2007 18:58:23 +0200:

Show 9 quoted lines

> >>
> >> Mine stops already at the directory -> symlink checkin (the above is the
> >> symlink -> directory one), but your trick of using "git checkout" as a
> >> trick to resolve things helped for both... eventually :-/
> > 
> > Hmm. What Git version do you have?
> 
> Not sure anymore, because I ran a systemwide upgrade late last night.
> *Now* I have git-1.5.1.4, but I think I had 1.5.1.2 before.

... and the rebase you tried originally works now? Or you didn't try? There were changes (substantial changes) in this area, so it might be fixed. If not, I'd like to hear, I personally rely on rebase heavily.

Show 8 quoted lines

> >> Either way, it's still a bug that it stops for either checkin, ...
> > 
> > Right. And because it is a bug, I'd like to have it fixed.
> > So, what did you do in that fixup?
> 
> I'm sorry, I'm not sure I understand the question, in particular, I'm
> getting the feeling I'm not sure what "that fixup" refers to.
>

>From your original report:

"git rebase dies horribly; on the first change it requires manual fixup, but it crashes on the second, with or without -m."

You mentioned that on the first change (I assumed it is the first time git-rebase stopped, complained, and asked for your help) "it" requires a "manual fixup". Which I assume you did, as it crashed on "second" (stop?). The "manual fixup" from the original report, what was it? Can you remember or find the sequence of commands you did before "it crashed on second"?