From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Zemacsh <ruini.xue@gmail.com>, git@vger.kernel.org
Subject: Re: "git apply --check" successes but git am says "does not match index"
Date: Mon, 15 Aug 2011 21:14:34 -0700 [thread overview]
Message-ID: <20110816041434.GA5141@sigill.intra.peff.net> (raw)
In-Reply-To: <7vd3g6j8sc.fsf@alter.siamese.dyndns.org>
On Mon, Aug 15, 2011 at 09:10:43PM -0700, Junio C Hamano wrote:
> 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
next prev parent reply other threads:[~2011-08-16 4:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-14 9:36 "git apply --check" successes but git am says "does not match index" Zemacsh
2011-08-15 23:23 ` Jeff King
2011-08-15 23:52 ` Junio C Hamano
2011-08-16 0:13 ` Jeff King
2011-08-16 4:10 ` Junio C Hamano
2011-08-16 4:14 ` Jeff King [this message]
2011-08-16 19:50 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110816041434.GA5141@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ruini.xue@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).