On Mon, Aug 10, 2015 at 01:43:07PM +0000, Ed Avis wrote:
> Jeff King <peff <at> 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 nice to see, but is not a substitute for the SHA.
I think you'd be _technically_ OK without the sha1 in the "applying
message", because you can refer to it as stash@{0} until it is dropped,
and the drop message does mention the sha1. But that seems needlessly
complicated for the user. I agree that including the sha1 is reasonable
(though we might want to use an abbreviated one if there is other stuff
to go on the line).
> If the stash pop failed because of conflicts then it could even print
>
> To drop this stash manually, run 'git stash drop abcde...'
Yup, that makes sense. You might want to make it optional an advice.*
config key, though. I also wondered if the "dropped" message is
sufficiently clear to new users. The point of it, I think, is to allow a
final "oops, I didn't mean to do that" moment. But there are no
instructions for how one would re-create the same stash.
It might be that showing instructions on even successful drops would
quickly get annoying, though. I dunno. I tend to turn off most of our
advice config myself.
> Another feature I would like to see is a kind of atomic stash apply, where
> either the whole change can be applied to the working tree without conflicts,
> or nothing happens.
I think that may be a bit harder, as the merge machinery would have to
know how to be atomic. Still, I agree it's a good goal if you'd like to
work on it.
-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html