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

From: Wincent Colaiuta <win@wincent.com>
Date: Dec 22, 2007, 18:44 UTC
Message-ID: <E8ED8DFC-9DD9-4A5C-A344-5279CEE15458@wincent.com>
In-Reply-To: <7vabo2y5la.fsf@gitster.siamese.dyndns.org>

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

Show 34 quoted lines

> Wincent Colaiuta <win@wincent.com> writes:
>
>> 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

Preserves the behaviour while avoiding the need for the creation of the ARGC variable, so if you prefer this solution then it seems fine by me.

Cheers, Wincent