[PATCH] Emit helpful status for accidental "git stash" save
- From
Wincent Colaiuta <win@wincent.com>
- Date
- Dec 22, 2007, 14:22 UTC
- Message-ID
- <1198333369-17788-1-git-send-email-win@wincent.com>
- In-Reply-To
- <7vmys36d7n.fsf@gitster.siamese.dyndns.org>
El 21/12/2007, a las 20:48, Junio C Hamano escribió:
Show 14 quoted lines
> (4) A tool should support safety for clueless people when it is > reasonable. > > Even though "I did not know what command foo does, so I > tried running it and it did something unexpected" is a > silly excuse to rob quickie "git stash" from people who > know better, we cannot avoid the fact that there are > clueless people. I think checking stash.iknowwhatitdoes to > detect first-time users, and explaining what it does to > them, may make sense. And we can take hints from the patch > that started this thread how to do this. > > The decision here is that I am open to a change that > implements the one-time safety instruction.
Here's a less invasive change that I think addresses this point (4) that you make.
-- 8< -- Emit helpful status for accidental "git stash" save
If the user types "git stash" mistakenly thinking that this will list their stashes he/she may be surprised to see that it actually saved a new stash and reset their working tree and index.
In the worst case they might not know how to recover the state. So help them by telling them exactly what was saved and also how to restore it immediately.
Signed-off-by: Wincent Colaiuta <win@wincent.com> --- git-stash.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/git-stash.sh b/git-stash.sh index f16fd9c..a2f3723 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -99,7 +99,8 @@ save_stash () { git update-ref -m "$stash_msg" $ref_stash $w_commit || die "Cannot save the current status" - printf >&2 'Saved "%s"\n' "$stash_msg" + printf >&2 'Saved working directory and index state "%s"\n' "$stash_msg" + echo >&2 '(To restore them type "git stash apply")' } have_stash () {
-- 1.5.4.rc0.68.g15eb8-dirty