Re: Behaviour of 'git stash show' when a stash has untracked files

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 21, 2017, 01:23 UTC
Message-ID: <xmqqpoakn8tj.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20170920193630.l7ifret5dpqgxiwm@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 6 quoted lines

> I sketched out a possible solution in:
>
>   https://public-inbox.org/git/20170317141417.g2oenl67k74nlqrq@sigill.intra.peff.net/
>
> though I share your concerns over whether people would be annoyed to see
> the existing "stash show" output changed.

Forgot about that one. I sometimes do "stash show -p | apply", so changing what is included without any option would be annoying, and not having an option to restore the original behaviour would be doubly irritating.

Perhaps "stash show [--[untracked|index|worktree]]" to show only one, without the "==> I am this variant <==" label, would be workable, and with no option we would do --worktree that is the traditional output.

In addition "stash show --all" could be the output in your earlier patch. I like the way it uses the '.' pathspec to squelch the entire thing when there is no change ;-)

Thanks.