Re: `git stash pop` UX Problem

From: Stephen Leake <stephen_leake@stephe-leake.org>
Date: Feb 27, 2014, 13:18 UTC
Message-ID: <85r46o3d9x.fsf@stephe-leake.org>
In-Reply-To: <xmqq4n3m6dic.fsf@gitster.dls.corp.google.com>

Junio C Hamano <gitster@pobox.com> writes:

Show 11 quoted lines

> Stephen Leake <stephen_leake@stephe-leake.org> writes:
>
>>> One _could_ argue that stashed changes are what could be reflected
>>> to the working tree and form the source of the latter, but my gut
>>> feeling is that it is a rather weak argument.  At that point you are
>>> talking about what you could potentially change in the working tree,
>>
>> No, I saved things in the stash on purpose. For example, I had changes
>> that were not ready to commit, but I wanted to do a merge from upstream.
>
> I often save things by running "git diff >P.diff" on purpose.

Ok. How is that better than 'git stash save'?

> Should "git status" read these patches and tell me what paths I
> could change in the working tree by applying it?

No, 'git stash save' appears to be the method git provides to do this, so it is the only one that git needs to support.

(The content of 'P.diff' already tells you what paths are modified, as does 'git stash show')

But I am new to git, so I could just be missing the point.

>Where does it end?

Where we agree it ends :).

Show 6 quoted lines

>> There are workflows where the stash is not important; provide an option
>> to 'git status' that means "ignore stash". 
>
> How is that different to tell those who want to know what are in the
> stash to type "git stash list" when they want to learn that
> information?

You are correct, this is a question of style. The question is:

Which style is best for git, considering the needs of newbies and seasoned users?

As a newbie, I find these things confusing:

- the stash status is not displayed by 'git status'

- 'git add' does not report that all pending merge conflicts are now
resolved.

I'm sure I will discover other confusing things in the future :).

I am a seasoned user of CM systems in general; in all cases, I have customized an Emacs front-end to do _exactly_ what I want, rather than relying on the command line tools directly. So I have a rather extreme perspective on this :). I do rely on the command line tools while learning a new CM system.

In general, I expect seasoned users to be more accepting of the need to provide additional options to customize the tools to their workflow.

-- 
-- Stephe