From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Aug 2011 22:32:32 GMT
Subject: Re: git apply-diff / am cannot deal with patches generated with git diff/format-patch --noprefix?
Message-ID: <7vfwl8sxrz.fsf@alter.siamese.dyndns.org>
In-Reply-To: <4E43053C.5080407@gmx.net>

marcel partap <mpartap@gmx.net> writes:

> ...at least it seems so. -p0 does not help:
>> fatal: git apply: bad git-diff - inconsistent old filename on line xx

Hmm, does not reproduce for me.

$ git checkout v1.7.6 ;# or whatever random commit I had at hand
$ git show --no-prefix >P.diff
$ grep "^diff --git" P.diff
diff --git Documentation/RelNotes/1.7.6.txt Documentation/RelNotes/1.7.6.txt
diff --git Documentation/git.txt Documentation/git.txt
diff --git GIT-VERSION-GEN GIT-VERSION-GEN
$ git checkout HEAD^
$ git apply -p0 <P.diff
$ git diff v1.7.6 ; echo nothing
nothing
$ git diff --stat
 Documentation/RelNotes/1.7.6.txt |    8 +-------
 Documentation/git.txt            |    5 +++++
 GIT-VERSION-GEN                  |    2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)