From: Chris Shoemaker <c.shoemaker@cox.net>
Date: Mon, 17 Sep 2007 00:46:23 GMT
Subject: Re: [PATCH] apply --index-info: fall back to current index for mode changes
Message-ID: <20070917004623.GA3826@pe.Belkin>
In-Reply-To: <Pine.LNX.4.64.0709170119270.28586@racer.site>

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 <johannes.schindelin@gmx.de>

Works for me.  Thanks.

Acked-by: Chris Shoemaker <chris.shoemaker@cox.net>