From: Kevin Leung <kevinlsk@gmail.com>
Date: Mon, 3 Dec 2007 02:34:05 +0000 (+0800)
Subject: git-stash: Display help message if git-stash is run with wrong sub-commands
X-Git-Tag: v1.5.4-rc0~111
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=683befa1788a216ac31f68bb6e8ae906fd511ab2;p=git.git

git-stash: Display help message if git-stash is run with wrong sub-commands

The current git-stash behaviour is very error prone to typos. For example,
if you typed "git-stash llist", git-stash would think that you wanted to
save to a stash named "llist", but in fact, you meant "git-stash list".

Signed-off-by: Kevin Leung <kevinlsk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-stash.sh b/git-stash.sh
index b1529e28b..f16fd9c3c 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright (c) 2007, Nanako Shiraishi
 
-USAGE='[ | list | show | apply | clear]'
+USAGE='[  | save | list | show | apply | clear | create ]'
 
 SUBDIRECTORY_OK=Yes
 OPTIONS_SPEC=
@@ -207,6 +207,10 @@ show)
 	shift
 	show_stash "$@"
 	;;
+save)
+	shift
+	save_stash "$*" && git-reset --hard
+	;;
 apply)
 	shift
 	apply_stash "$@"
@@ -221,14 +225,12 @@ create)
 	fi
 	create_stash "$*" && echo "$w_commit"
 	;;
-help | usage)
-	usage
-	;;
 *)
-	if test $# -gt 0 && test "$1" = save
+	if test $# -eq 0
 	then
-		shift
+		save_stash && git-reset --hard
+	else
+		usage
 	fi
-	save_stash "$*" && git-reset --hard
 	;;
 esac