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

From: Alex Riesen <raa.lkml@gmail.com>
Date: May 8, 2007, 21:50 UTC
Message-ID: <20070508215009.GA2670@steel.home>
In-Reply-To: <463FCD7C.4020009@zytor.com>

H. Peter Anvin, Tue, May 08, 2007 03:08:12 +0200:

Show 8 quoted lines

> The following tree:
> 
> http://git.kernel.org/?p=linux/kernel/git/hpa/linux-2.6-newsetup.git;a=summary
> 
> ... has one commit which changes arch/x86_64/boot from a directory to a
> symlink, and another one which changes it back.  Apparently as a result,
> git rebase dies horribly; on the first change it requires manual fixup,
> but it crashes on the second, with or without -m.

What kind of manual fixup did you do? I tried to reproduce it, and did the following:

    git clone --reference ~/linux.git git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-newsetup.git
    cd linux-2.6-newsetup.git
    git rebase a989705c4cf6e6c1a339c95f9daf658b4ba88ca8

It stopped at 'Revert "x86-64: Make arch/x86-64/boot a symlink to arch/i386/boot"' aka cd312503f8e8a88895b12bf810677406284142e6. I went on:

    rm arch/x86-64/boot
    git checkout cd312503f8e8a88895b12bf810677406284142e6 arch/x86-64/boot
    git rebase --continue

And then it just continued until all commits were rebased. I have a very recent git, so maybe that's why it worked.