From: Matthias Lehmann <mat@matlehmann.de>
To: git@vger.kernel.org
Subject: Re: git-apply fails on creating a new file, with both -p and --directory specified
Date: Thu, 29 Apr 2010 10:20:17 +0200 [thread overview]
Message-ID: <hrbfg2$t5m$1@dough.gmane.org> (raw)
In-Reply-To: 201004281429.26579.mat@matlehmann.de
Matthias Lehmann wrote:
> Hi all,
>
> the subject of this mail may read familiar to some - there was a
> discussion in November last year (see
> http://kerneltrap.org/mailarchive/git/2009/11/23/16899/) concerning this
> problem.
>
> Today I had this same issue with git 1.7.0.4. Reading the above mentioned
> discussion and seaching the net did not help me in finding a solution to
> the problem.
>
> I have to apply patches from one repository to another repository, which
> have a different layout (I am working on splitting one big repository into
> several smaller ones, while development still continues on the big
> repository).
>
> So I did
>
> big-repo$ git format-patche -o /tmp/foo
> small-repo$ git apply -p2 --directory=some/path --check /tmp/foo/*
>
> and get
>
> fatal: git diff header lacks filename information when removing 2 leading
> pathname components (line 37)
>
> the patch looks like this:
>
> 35| diff --git a/xyz/bar.jpg b/xyz/bar.jpg
> 36| new file mode 100644
> 37| index
>
0000000000000000000000000000000000000000..3dcce2e1f68586ed2089d86b1bf4e7e41c818d97
> 38| GIT binary patch
> 39| literal 8791
>
>
>
> Since this problem was discussed before - is there a solution?
> This is something like a showstopper for me right now, so I am very
> thankful for any hints.
>
> Best regards,
>
> Mat
Is there anything I can do to get some feedback to this issue? I don't want
to be impatient, it's just quite important to me.
Since I have not much experience in reporting issues to a mailing list, it
might well be, that I did something wrong - so please correct me and direct
me to how I can be of better help.
Best regards,
Mat
next prev parent reply other threads:[~2010-04-30 18:32 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-28 12:29 git-apply fails on creating a new file, with both -p and --directory specified Matthias Lehmann
2010-04-29 8:20 ` Matthias Lehmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-11-23 19:45 Steven J. Murdoch
2009-11-25 10:56 ` Junio C Hamano
2009-12-07 21:35 ` James Vega
2009-12-08 2:59 ` Junio C Hamano
2009-12-08 3:20 ` Junio C Hamano
2009-12-08 5:47 ` Jeff King
2009-12-08 6:01 ` Jeff King
2009-12-08 6:49 ` James Vega
2009-12-08 7:28 ` Junio C Hamano
2009-12-08 7:49 ` Jeff King
2009-12-08 7:53 ` Junio C Hamano
2009-12-08 7:11 ` Junio C Hamano
2009-12-08 7:38 ` Jeff King
2009-12-08 3:39 ` James Vega
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='hrbfg2$t5m$1@dough.gmane.org' \
--to=mat@matlehmann.de \
--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.