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

Re: [PATCH] apply --index-info: fall back to current index for mode changes

From: Chris Shoemaker <hidden>
Date: 2016-06-15 22:43:35

On Mon, Sep 17, 2007 at 01:24:57AM +0100, Johannes Schindelin wrote:
"git diff" does not record index lines for pure mode changes (i.e. no
lines changed).  Therefore, apply --index-info would call out a bogus
error.

Instead, fall back to reading the info from the current index.

Incidentally, this fixes an error where git-rebase would not rebase a 
commit including a pure mode change, and changes requiring a threeway 
merge.

Noticed by Chris Shoemaker.

Signed-off-by: Johannes Schindelin <redacted>
Works for me.  Thanks.

Acked-by: Chris Shoemaker <redacted>
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help