Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

Re: git-apply fails on creating a new file, with both -p and --directory specified

From: James Vega <hidden>
Date: 2016-06-15 22:47:51

Possibly related (same subject, not in this thread)

On Mon, Dec 07, 2009 at 06:59:28PM -0800, Junio C Hamano wrote:
James Vega [off-list ref] writes:
quoted
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 [off-list ref]
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help