git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Wincent Colaiuta <win@wincent.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Emit helpful status for accidental "git stash" save
Date: Sat, 22 Dec 2007 08:22:34 -0800	[thread overview]
Message-ID: <7vmys2ya0l.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <1198333369-17788-1-git-send-email-win@wincent.com> (Wincent Colaiuta's message of "Sat, 22 Dec 2007 15:22:49 +0100")

Wincent Colaiuta <win@wincent.com> writes:

> 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 () {

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

  reply	other threads:[~2007-12-22 16:23 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-12-21 10:22 [PATCH] Make "git stash" configurable しらいしななこ
2007-12-21 17:23 ` Steven Grimm
2007-12-21 17:27   ` Matthieu Moy
2007-12-21 17:54     ` Junio C Hamano
2007-12-21 18:26       ` Steven Grimm
2007-12-21 19:48   ` Junio C Hamano
2007-12-22 14:22     ` [PATCH] Emit helpful status for accidental "git stash" save Wincent Colaiuta
2007-12-22 16:22       ` Junio C Hamano [this message]
2007-12-22 17:31         ` [PATCH v2] " Wincent Colaiuta
2007-12-22 17:58           ` Junio C Hamano
2007-12-22 18:44             ` Wincent Colaiuta

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vmys2ya0l.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=win@wincent.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).