From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>, git@vger.kernel.org
Subject: Re: Behaviour of 'git stash show' when a stash has untracked files
Date: Wed, 20 Sep 2017 15:36:30 -0400 [thread overview]
Message-ID: <20170920193630.l7ifret5dpqgxiwm@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqfubinddb.fsf@gitster.mtv.corp.google.com>
On Wed, Sep 20, 2017 at 02:33:04PM +0900, Junio C Hamano wrote:
> Kaartic Sivaraam <kaarticsivaraam91196@gmail.com> writes:
>
> > Some time ago, I stashed a few changes along with untracked files. I
> > almost forgot it until recently. Then I wanted to see what I change I
> > had in the stash. So I did a 'git stash show <num>'. It worked fine but
> > didn't say anything about the untracked files in that stash. That made
> > me wonder where the untracked files I added went. I then applied the
> > stash to see that they were still there but weren't listed in show.
> >
> > I understand that they aren't listed because 'git stash show' is
> > typically a "diff between the stashed state and its original parent" as
> > the documentation says but shouldn't there be at least a message that
> > the stash contains untracked files? Those untracked files are "part of
> > the stash" and I see no way to get information about their presence
> > currently.
> >
> > So, should this behaviour be changed?
>
> Hmm, crickets tell us that nobody is all that interested in this, it
> seems.
Or sometimes people are just really behind in reading the mailing list. ;)
This seemed familiar, and indeed there was some discussion a few months
ago:
https://public-inbox.org/git/CAOtcWM3mrQEqDnjMipzea7Kp+VueBFsZDL2zcJ=y0wgj9N4Vjw@mail.gmail.com/
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.
-Peff
next prev parent reply other threads:[~2017-09-20 19:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-17 5:27 Behaviour of 'git stash show' when a stash has untracked files Kaartic Sivaraam
2017-09-20 5:33 ` Junio C Hamano
2017-09-20 19:36 ` Jeff King [this message]
2017-09-21 1:23 ` Junio C Hamano
2017-09-21 3:31 ` Jeff King
2017-09-23 7:11 ` Kaartic Sivaraam
2017-09-24 0:41 ` Junio C Hamano
2017-09-23 7:03 ` Kaartic Sivaraam
-- strict thread matches above, loose matches on Subject: below --
2017-09-17 5:07 Kaartic Sivaraam
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170920193630.l7ifret5dpqgxiwm@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kaarticsivaraam91196@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).