summaryrefslogtreecommitdiff
path: root/git-stash.sh
diff options
context:
space:
mode:
authorBrian Gernhardt <brian@gernhardtsoftware.com>2010-09-24 22:15:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-09-27 04:27:37 (GMT)
commit9027fa9eb7df606b6658dd48a40bb993ce222ddd (patch)
treeff216c0ddd51651f61aeb8127d7a2d4bec6f0088 /git-stash.sh
parent3fcb88785da831ad7d53cf18b4398099179c9c87 (diff)
downloadgit-9027fa9eb7df606b6658dd48a40bb993ce222ddd.zip
git-9027fa9eb7df606b6658dd48a40bb993ce222ddd.tar.gz
git-9027fa9eb7df606b6658dd48a40bb993ce222ddd.tar.bz2
git-stash: fix flag parsing
Currently git-stash uses `git rev-parse --no-revs -- "$@"` to set its FLAGS variable. This is the same as `FLAGS="-- $@"`. It should use `git rev-parse --no-revs --flags "$@"`, but that eats any "-q" or "--quiet" argument. So move the check for quiet before rev-parse. Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-stash.sh')
-rwxr-xr-xgit-stash.sh15
1 files changed, 11 insertions, 4 deletions
diff --git a/git-stash.sh b/git-stash.sh
index 7ce818b..57f36ce 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -264,8 +264,18 @@ parse_flags_and_rev()
b_tree=
i_tree=
+ # Work around rev-parse --flags eating -q
+ for opt
+ do
+ case "$opt" in
+ -q|--quiet)
+ GIT_QUIET=t
+ ;;
+ esac
+ done
+
REV=$(git rev-parse --no-flags --symbolic "$@" 2>/dev/null)
- FLAGS=$(git rev-parse --no-revs -- "$@" 2>/dev/null)
+ FLAGS=$(git rev-parse --no-revs --flags "$@" 2>/dev/null)
set -- $FLAGS
@@ -273,9 +283,6 @@ parse_flags_and_rev()
while test $# -ne 0
do
case "$1" in
- -q|--quiet)
- GIT_QUIET=-t
- ;;
--index)
INDEX_OPTION=--index
;;