Re: git-apply fails to apply some patches
- From
Junio C Hamano <junkio@cox.net>
- Date
- Sep 17, 2006, 06:16 UTC
- Message-ID
- <7vzmcz6mrq.fsf@assigned-by-dhcp.cox.net>
- In-Reply-To
- <20060915132225.12040.qmail@a0896f98af57b2.315fe32.mid.smarden.org>
Gerrit Pape <pape@smarden.org> writes:
Show 15 quoted lines
>... > On top of that, I try to apply this interdiff generated patch: > > diff -u pciutils-2.1.11/debian/dirs pciutils-2.1.11/debian/dirs > --- pciutils-2.1.11/debian/dirs > +++ pciutils-2.1.11/debian/dirs > @@ -6,0 +7 @@ > +var/lib/pciutils > > and git-apply says: > > error: debian/dirs: already exists in working directory > > I suspect it's confused by the '-x,0' thinking that means "file does not > exist" rather than "we have 0 context for this diff".
There are a few safety checks we perform assuming that the patch has a few lines of context, and this is falsely triggering one of them. It incorrectly thinks that seeing _no_ context nor old lines in the patch means this is a file creation patch, and complains because it knows the file being patched already exists.
I am looking into a way to handle a context-less patch line the one quoted, without breaking the sanity check we have.
In the meantime you should be able to work things around by not feeding --unified=0 diff output.