From 97bc00a4909fb73eba8a05dc89fe7914d7123245 Mon Sep 17 00:00:00 2001 From: Wincent Colaiuta Date: Sat, 22 Dec 2007 18:31:25 +0100 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- git-stash.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/git-stash.sh b/git-stash.sh index f16fd9c3c..06cb177ec 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -99,7 +99,7 @@ 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" } have_stash () { @@ -228,7 +228,9 @@ create) *) if test $# -eq 0 then - save_stash && git-reset --hard + save_stash && + echo >&2 '(To restore them type "git stash apply")' && + git-reset --hard else usage fi -- 2.26.2