From: Jeff King Date: Tue, 16 Aug 2011 04:14:34 GMT Subject: Re: "git apply --check" successes but git am says "does not match index" 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: > Jeff King 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