X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-stash.sh;h=59db3dc38e72fda88d521171a174c08b919677a9;hb=582aa00bdffb27abcf1b27d541b4c231a395d3b8;hp=2d691963934c31242512bd4dd349d970c0350243;hpb=801bad3ba4eb5014d402201c85c61a969436adf0;p=git.git

diff --git a/git-stash.sh b/git-stash.sh
index 2d6919639..59db3dc38 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -151,6 +151,7 @@ save_stash () {
 			;;
 		-*)
 			echo "error: unknown option for 'stash save': $1"
+			echo "       To provide a message, use git stash save -- '$1'"
 			usage
 			;;
 		*)
@@ -209,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
 }