git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ori Avtalion <ori@avtalion.name>
To: git@vger.kernel.org
Subject: [PATCH] git stash: Give friendlier error when there is nothing to apply
Date: Tue, 11 Aug 2009 14:12:13 +0300	[thread overview]
Message-ID: <4a81559c.05ae660a.591b.010b@mx.google.com> (raw)

The old message was scary and included a 'fatal' error from rev-parse:
     fatal: Needed a single revision
     : no valid stashed state found

The new message is identical to the one given by 'git stash branch', and
given *before* the check for a dirty working tree.

Previously, the command prompted the user to clean a dirty working tree
when there is nothing to apply.

Signed-off-by: Ori Avtalion <ori@avtalion.name>
---
 git-stash.sh |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/git-stash.sh b/git-stash.sh
index 03e589f..aa84144 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -162,6 +162,8 @@ show_stash () {
 }
 
 apply_stash () {
+	have_stash || die 'Nothing to apply'
+
 	git update-index -q --refresh &&
 	git diff-files --quiet --ignore-submodules ||
 		die 'Cannot apply to a dirty working tree, please stage your changes'
-- 
1.6.4.73.gc144.dirty

             reply	other threads:[~2009-08-11 11:55 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-11 11:12 Ori Avtalion [this message]
2009-08-11 12:09 ` [PATCH] git stash: Give friendlier error when there is nothing to apply Thomas Rast
2009-08-11 11:12   ` [PATCH] git stash: Give friendlier errors " Ori Avtalion
2009-08-13  7:35     ` Thomas Rast
2009-08-14 19:52     ` Junio C Hamano
2009-08-14 21:39       ` Nanako Shiraishi
2009-08-15  1:50         ` Junio C Hamano

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=4a81559c.05ae660a.591b.010b@mx.google.com \
    --to=ori@avtalion.name \
    --cc=git@vger.kernel.org \
    /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).