X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-stash.sh;h=f16fd9c3c0e5b9248623d1d65146504c603fc840;hb=9b433e44964202befd175f1f28687067b8bd058f;hp=534eb168abf8b0b8ae5c2195bf85b66d9cb6b21e;hpb=d794d9e70ebb8c767b04f25c03290ef305cd31ab;p=git.git

diff --git a/git-stash.sh b/git-stash.sh
index 534eb168a..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=
@@ -15,7 +15,7 @@ trap 'rm -f "$TMP-*"' 0
 ref_stash=refs/stash
 
 no_changes () {
-	git diff-index --quiet --cached HEAD &&
+	git diff-index --quiet --cached HEAD -- &&
 	git diff-files --quiet
 }
 
@@ -37,7 +37,7 @@ create_stash () {
 	# state of the base commit
 	if b_commit=$(git rev-parse --verify HEAD)
 	then
-		head=$(git log --abbrev-commit --pretty=oneline -n 1 HEAD)
+		head=$(git log --no-color --abbrev-commit --pretty=oneline -n 1 HEAD --)
 	else
 		die "You do not have the initial commit yet"
 	fi
@@ -108,7 +108,7 @@ have_stash () {
 
 list_stash () {
 	have_stash || return 0
-	git log --pretty=oneline -g "$@" $ref_stash |
+	git log --no-color --pretty=oneline -g "$@" $ref_stash -- |
 	sed -n -e 's/^[.0-9a-f]* refs\///p'
 }
 
@@ -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