From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 22 Dec 2007 17:58:09 GMT
Subject: Re: [PATCH v2] Emit helpful status for accidental "git stash" save
Message-ID: <7vabo2y5la.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <1198344685-24156-1-git-send-email-win@wincent.com>

Wincent Colaiuta <win@wincent.com> writes:

> 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?

Sure, even like this.

 git-stash.sh |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/git-stash.sh b/git-stash.sh
index f16fd9c..ade300c 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