From: Sam Ravnborg <sam@ravnborg.org>
To: Alex Riesen <raa.lkml@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git apply fails to apply a renamed file in a new directory
Date: Thu, 25 Oct 2007 23:41:19 +0200 [thread overview]
Message-ID: <20071025214119.GC15292@uranus.ravnborg.org> (raw)
In-Reply-To: <20071025213523.GD11308@steel.home>
On Thu, Oct 25, 2007 at 11:35:23PM +0200, Alex Riesen wrote:
> 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.
>
> 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
prev parent reply other threads:[~2007-10-25 21:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-25 18:07 git apply fails to apply a renamed file in a new directory Sam Ravnborg
2007-10-25 21:30 ` Alex Riesen
2007-10-25 21:35 ` Alex Riesen
2007-10-25 21:41 ` Sam Ravnborg [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071025214119.GC15292@uranus.ravnborg.org \
--to=sam@ravnborg.org \
--cc=git@vger.kernel.org \
--cc=raa.lkml@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).