[PATCH v2] Emit helpful status for accidental "git stash" save

[Wincent Colaiuta <win@wincent.com>]

El 22/12/2007, a las 17:22, Junio C Hamano escribió:

> I like that "To restore them..." insn, and I like that this is
> much less invasive than anything we have seen during the
> discussion.  But can we do this only for an accidental "git
> stash" not for a deliberate "git stash save"?

Something like this then?

-- 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 |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/git-stash.sh b/git-stash.sh
index f16fd9c..ab52b6f 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -13,6 +13,7 @@ TMP="$GIT_DIR/.git-stash.$$"
 trap 'rm -f "$TMP-*"' 0
 
 ref_stash=refs/stash
+ARGC=$#
 
 no_changes () {
 	git diff-index --quiet --cached HEAD -- &&
@@ -99,7 +100,9 @@ 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"
+	test $ARGC -eq 0 &&
+		echo >&2 '(To restore them type "git stash apply")'
 }
 
 have_stash () {
-- 
1.5.4.rc0.68.g15eb8-dirty