From: Junio C Hamano <junkio@cox.net>
Date: Sat, 12 May 2007 00:32:43 GMT
Subject: Re: git rebase chokes on directory -> symlink -> directory
Message-ID: <7vps569904.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <46413565.3090503@zytor.com>

"H. Peter Anvin" <hpa@zytor.com> writes:

> 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 :-/

I've tried to redo your rebase using:

	apply: do not get confused by symlinks in the middle

patch on top of 'master'.  It successfully run through the end.
After rebasing f1bb07af ("rebase-1" in your repository) on to
a989705 (near the tip of Linus), I did

	git diff --stat --summary a989705...f1bb07af
        git diff --stat --summary a989705...HEAD

(that is, "show me the change since the merge base") and the
results from these two diffs match exactly.

So I think I can declare victory for now ;-).

However.

I usually have "[apply] whitespace = strip" in my ~/.gitconfig,
but during this verification run, I disabled it to keep rebase
from falling back to 3-way merge using merge-recursive.  If I
turn it on, rebase still fails and I strongly suspect "rebase
-m" would fail the same way, although I haven't tried it (it
takes too much time).

I'll be somewhat busy this weekend, so I would welcome anybody
else beating me to fixing the problem in merge-recursive.