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

Re: "git apply --check" successes but git am says "does not match index"

From
Jeff King <peff@peff.net>
Date
Aug 16, 2011, 04:14 UTC
Message-ID
<20110816041434.GA5141@sigill.intra.peff.net>
In-Reply-To
<7vd3g6j8sc.fsf@alter.siamese.dyndns.org>
On Mon, Aug 15, 2011 at 09:10:43PM -0700, Junio C Hamano wrote:
Show 6 quoted lines
> Jeff King <peff@peff.net> writes:
> 
> > ... I wonder if "git rebase" actually
> > suffers from the same problem,...
> 
> Doesn't it require a spiffy clean work tree before even starting?

Ah, you're right. I was confused that the continue case called update-index, but the regular case did not. But it calls require_clean_work_tree, which refreshes the index (in addition to checking the dirty state, of course). So it's fine.

-Peff
Previous: Junio C HamanoNext: Junio C Hamano
Message 6 of 7 in “"git apply --check" successes but git am says "does not match index"”
  1. ZemacshAug 14, 2011
  2. Jeff KingAug 15, 2011
  3. Junio C HamanoAug 15, 2011
  4. Jeff KingAug 16, 2011
  5. Junio C HamanoAug 16, 2011
  6. Jeff KingAug 16, 2011
  7. Junio C HamanoAug 16, 2011

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.