Merge branch 'gh/maint-stash-show-error-message' into maint

* gh/maint-stash-show-error-message: Improve error messages from 'git stash show'
git-mirror · Apr 10, 2010 · 5d4bd79 · 5d4bd79
2 parents e80014a + 14cd458
commit 5d4bd79
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/git-stash.sh b/git-stash.sh
@@ -210,14 +210,18 @@ list_stash () {
 }
 
 show_stash () {
+	have_stash || die 'No stash found'
+
 	flags=$(git rev-parse --no-revs --flags "$@")
 	if test -z "$flags"
 	then
 		flags=--stat
 	fi
 
-	w_commit=$(git rev-parse --verify --default $ref_stash "$@") &&
-	b_commit=$(git rev-parse --verify "$w_commit^") &&
+	w_commit=$(git rev-parse --quiet --verify --default $ref_stash "$@") &&
+	b_commit=$(git rev-parse --quiet --verify "$w_commit^") ||
+		die "'$*' is not a stash"
+
 	git diff $flags $b_commit $w_commit
 }