From: "H. Peter Anvin" <hpa@zytor.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: git apply --directory broken for new files
Date: Thu, 25 Sep 2008 13:41:56 -0700 [thread overview]
Message-ID: <48DBF794.9030809@zytor.com> (raw)
Trying with git 1.6.0.1:
: tazenda 124 ; git apply --directory=gpxe/ < /tmp/diff
fatal: git-apply: bad git-diff - inconsistent new filename on line 105
Line 105 in the diff is:
101 diff --git a/src/arch/i386/firmware/pcbios/fakee820.c
b/src/arch/i386/firmware/pcbios/fakee820.c
102 new file mode 100644
103 index 0000000..e171edf
104 --- /dev/null
105 +++ b/src/arch/i386/firmware/pcbios/fakee820.c
What I'm trying to do here is to apply a diff created via "git diff" to
a subdirectory of another git repository.
-hpa
next reply other threads:[~2008-09-25 20:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-25 20:41 H. Peter Anvin [this message]
2008-09-27 1:54 ` git apply --directory broken for new files Jeff King
2008-10-12 3:18 ` Junio C Hamano
2008-10-12 4:06 ` Jeff King
2008-10-12 6:36 ` Junio C Hamano
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=48DBF794.9030809@zytor.com \
--to=hpa@zytor.com \
--cc=git@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.