From: Pierre-Marc Fournier <pierre-marc.fournier@polymtl.ca>
To: git@vger.kernel.org
Subject: git-am -p fails with new file
Date: Fri, 24 Jul 2009 14:09:30 -0400 [thread overview]
Message-ID: <4A69F8DA.9060406@polymtl.ca> (raw)
I have a patch generated with git format-patch. I am trying to apply it
in a repository that contains only a subdirectory of the original
repository.
Therefore, I need to use git-am -p, which fails with the following message.
fatal: git apply: bad git-diff - inconsistent new filename on line 33
Is there a code path missing in parse_git_header() to strip the
directories as requested by -p?
Please CC me. Thanks.
pmf
reply other threads:[~2009-07-24 18:24 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=4A69F8DA.9060406@polymtl.ca \
--to=pierre-marc.fournier@polymtl.ca \
--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 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).