Re: [RFC/PATCH 3/2] stash: show combined diff with "stash show"

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 31, 2014, 00:28 UTC
Message-ID: <CAPc5daWuyELptgGgBUxD_etTM3H40tneKXTrtFM3NLaneiibBA@mail.gmail.com>
In-Reply-To: <20140731001746.GC22297@peff.net>

On Wed, Jul 30, 2014 at 5:17 PM, Jeff King <peff@peff.net> wrote:

Show 5 quoted lines

>
> Like I said, I'm iffy on this part of the series for that reason. But
> I'm curious: what do you think should happen in such a use case when
> there are staged contents in the index? Right now we completely ignore
> them.

I think ignoring is absolutely the right thing ;-)

Unlike "stash pop", which is "try to bring me back to exactly the same state", it is a strong indication that the user wants to further tweak the previous work to grab a patch and apply to the working tree---and while you are working inside the working tree, you haven't started adding the index contents, so "git diff" after such an operation should show what you grabbed out of the stash, applied to the working tree, relative to what you had in the index.