From: James Vega <vega.james@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: git-apply fails on creating a new file, with both -p and --directory specified
Date: Mon, 7 Dec 2009 22:39:31 -0500 [thread overview]
Message-ID: <20091208033931.GK14401@jamessan.com> (raw)
In-Reply-To: <7vk4wyqigf.fsf@alter.siamese.dyndns.org>
On Mon, Dec 07, 2009 at 06:59:28PM -0800, Junio C Hamano wrote:
> James Vega <vega.james@gmail.com> writes:
>
> > It looks like this may have introduced a bug when staging a file
> > removal. Here's an example git session showing the issue:
> > <<snipped>>
>
> Thanks for a report, but I cannot get the evidence that the said patch has
> anything to do with the issue you illustrated.
Right, I incorrectly assumed the problem was with git-apply when I saw
Steve's patch since the symptoms seemed similar.
I just finished a bisect, though, and the problem is in removing a
non-empty file with "git add -p". This wasn't caught by existing tests
because they only try to remove an empty file.
This was introduced in
8f0bef6 (git-apply--interactive: Refactor patch mode code, 2009-08-13)
--
James
GPG Key: 1024D/61326D40 2003-09-02 James Vega <vega.james@gmail.com>
next prev parent reply other threads:[~2009-12-08 3:39 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-23 19:45 git-apply fails on creating a new file, with both -p and --directory specified 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 [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-04-28 12:29 Matthias Lehmann
2010-04-29 8:20 ` Matthias Lehmann
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=20091208033931.GK14401@jamessan.com \
--to=vega.james@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.