git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
CSChris Shoemaker <c.shoemaker@cox.net>
Date
Sep 17, 2007, 00:46 UTC
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:
Show 14 quoted lines
> 
> "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>
Previous: Johannes Schindelin
Message 2 of 2 in “apply --index-info: fall back to current index for mode changes”
  1. apply --index-info: fall back to current index for mode changesJohannes Schindelin, Sep 17, 2007
  2. Chris ShoemakerSep 17, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.