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

2017-09-23 Thread Junio C Hamano
Jeff King writes: > I think it would mostly Just Work for your case. git-apply should ignore > the subject cruft at the top of the patch. And if you didn't create a > stash with "-u" or with bits in the index, then those would be absent > from the diff. > > And if you _did_ create such a stash, I

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

2017-09-23 Thread Kaartic Sivaraam
On Wed, 2017-09-20 at 23:31 -0400, Jeff King wrote: > But I have always been bothered how the saved state > is a bit hidden from the user. It seems like a recipe for user confusion > when they save something with "git stash" but then "stash show" doesn't > even mention it. > Yeah, I feel the same

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

2017-09-23 Thread Kaartic Sivaraam
On Wed, 2017-09-20 at 15:36 -0400, Jeff King wrote: > > 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=y0wg

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

2017-09-20 Thread Jeff King
On Thu, Sep 21, 2017 at 10:23:36AM +0900, Junio C Hamano wrote: > Jeff King writes: > > > I sketched out a possible solution in: > > > > > > https://public-inbox.org/git/20170317141417.g2oenl67k74nl...@sigill.intra.peff.net/ > > > > though I share your concerns over whether people would be an

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

2017-09-20 Thread Junio C Hamano
Jeff King writes: > I sketched out a possible solution in: > > > https://public-inbox.org/git/20170317141417.g2oenl67k74nl...@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.

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

2017-09-20 Thread Jeff King
On Wed, Sep 20, 2017 at 02:33:04PM +0900, Junio C Hamano wrote: > Kaartic Sivaraam 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 '. It w

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

2017-09-19 Thread Junio C Hamano
Kaartic Sivaraam 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 '. It worked fine but > didn't say anything about the untracked files in that stas

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

2017-09-16 Thread Kaartic Sivaraam
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 '. It worked fine but didn't say anything about the untracked files in that stash. That made me wonder where the un

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

2017-09-16 Thread Kaartic Sivaraam
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 '. It worked fine but didn't say anything about the untracked files in that stash. That made me wonder where the un