Thread (1 message) 1 message, 1 author, 2021-02-16

Re: [PATCH v2 8/9] stash show: teach --include-untracked and --only-untracked

From: Junio C Hamano <hidden>
Date: 2021-02-16 06:43:57

Denton Liu [off-list ref] writes:
Hi Junio,

On Tue, Feb 09, 2021 at 11:53:06PM -0800, Junio C Hamano wrote:
quoted
quoted
Do this via something like

	GIT_INDEX_FILE=... git read-tree stash stash^3

and diffing the resulting tree object against the stash base.
That explains the implementation, but does not make it clear what
the implementation wants to achieve.  So we read the tree from stash
(i.e. working tree) into a temporary index, and then overlay the
tree of stash^3 (i.e. untracked) on top---which means the resulting
"index" has the state of the working tree plus the untracked cruft
in it.  And comparing that with "stash base" (by the way is that a
term well understood?  I borrowed it for the above review comment,
which shows that there certainly is need for such a term) would show
I'm not sure if it's a well-understood term but I can't think of any
other meanings for the term so it doesn't seem very ambiguous.
Thanks.  I was hoping to hear either "Yes, glossary defines it like
this" or "I believe it is an unambiguous good term; let's add it to
the glossary".
I'll send out my revised patch later today and I was unable to figure
out an easy way of doing this.
OK.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help