Re: git apply fails to apply a renamed file in a new directory

From: Sam Ravnborg <sam@ravnborg.org>
Date: Oct 25, 2007, 21:41 UTC
Message-ID: <20071025214119.GC15292@uranus.ravnborg.org>
In-Reply-To: <20071025213523.GD11308@steel.home>

On Thu, Oct 25, 2007 at 11:35:23PM +0200, Alex Riesen wrote:

Show 18 quoted lines

> Alex Riesen, Thu, Oct 25, 2007 23:30:38 +0200:
> > Sam Ravnborg, Thu, Oct 25, 2007 20:07:37 +0200:
> > > I just stumbled on what looks like a simple bug in git apply.
> > > I had following diff:
> > > 
> > > diff --git a/arch/i386/defconfig b/arch/x86/configs/i386_defconfig
> > > similarity index 100%
> > > rename from arch/i386/defconfig
> > > rename to arch/x86/configs/i386_defconfig
> > > diff --git a/arch/x86_64/defconfig b/arch/x86/configs/x86_64_defconfig
> > > similarity index 100%
> > > rename from arch/x86_64/defconfig
> > > rename to arch/x86/configs/x86_64_defconfig
> > > -- 
> > > 1.5.3.4.1157.g0e74-dirty
> 
> .1157...-dirty. Your git looks heavily modified. Could you try with a
> something like master of kernel.org?

I guess I still have Linus' rename stuff added - will update.

Show 9 quoted lines

> 
> Mine is based off d90a7fda355c251b8ffdd79617fb083c18245ec2
> (builtin-fetch got merged).
> 
> > > When trying to apply this diff using:
> > > git apply -p1 < .../patch
> > 
> > works here. Don't use -p1, it is assumed
> >

It seems to be a picnic[*] bug - at least I cannot reproduce it. Sorry for the noise but thanks for testing.

[*] Problem In Chair Not In Computer

Sam