Re: Feature: git stash pop --always-drop

2015-08-10 Thread Ed Avis
Junio C Hamano pobox.com> writes: >>Yes, my use case is that I get confused about whether the stash has been >>dropped or not and whether I might have stashed something else in the >>meantime. So for me plain 'git stash drop' feels a bit dangerous. > >Then "git stash apply" followed by "git sta

Re: Feature: git stash pop --always-drop

2015-08-10 Thread Junio C Hamano
Ed Avis writes: > Yes, my use case is that I get confused about whether the stash has been > dropped or not and whether I might have stashed something else in the > meantime. So for me plain 'git stash drop' feels a bit dangerous. Then "git stash apply" followed by "git stash drop" would be a p

Re: Feature: git stash pop --always-drop

2015-08-10 Thread Ed Avis
> Yes, my use case is that I get confused about whether the stash has been dropped or not and whether I might have stashed something else in the meantime. So for me plain 'git stash drop' feels a bit dangerous. Jeff King peff.net> writes: >I also wondered if the "dropped" message is >sufficient

Re: Feature: git stash pop --always-drop

2015-08-10 Thread Jeff King
On Mon, Aug 10, 2015 at 01:43:07PM +, Ed Avis wrote: > Jeff King peff.net> writes: > > >>An alternative would be for git stash to always print the name of the stash > >>it is applying. > > > Applying refs/stash@{0} (31cb86c3d700d241e315d989f460e3e83f84fa19) > > Yes, that's the one. > > >

Re: Feature: git stash pop --always-drop

2015-08-10 Thread Ed Avis
Jeff King peff.net> writes: >>An alternative would be for git stash to always print the name of the stash >>it is applying. > Applying refs/stash@{0} (31cb86c3d700d241e315d989f460e3e83f84fa19) Yes, that's the one. >Or maybe it would be useful to actually show the stash subject, That could be

Re: Feature: git stash pop --always-drop

2015-08-10 Thread Jeff King
On Mon, Aug 10, 2015 at 12:50:51PM +, Ed Avis wrote: > An alternative would be for git stash to always print the name of the stash > it is applying. Then you can drop it afterwards by name and be sure you got > the right one. Printing the name of the stash sounds like a reasonable > bit of c

Re: Feature: git stash pop --always-drop

2015-08-10 Thread Ed Avis
An alternative would be for git stash to always print the name of the stash it is applying. Then you can drop it afterwards by name and be sure you got the right one. Printing the name of the stash sounds like a reasonable bit of chatter to add anyway, do you agree? -- Ed Avis -- To unsubscri

Re: Feature: git stash pop --always-drop

2015-08-10 Thread Jeff King
On Mon, Aug 10, 2015 at 10:42:30AM +, Ed Avis wrote: > I would find it useful to ask 'git stash pop' to always drop the stash after > applying it to the working tree, even if there were conflicts. (Only if there > was some hard error, such as an I/O error updating some of the files, should >

Feature: git stash pop --always-drop

2015-08-10 Thread Ed Avis
I would find it useful to ask 'git stash pop' to always drop the stash after applying it to the working tree, even if there were conflicts. (Only if there was some hard error, such as an I/O error updating some of the files, should the stash be left on the stack.) Would a patch for such an --alwa