Skip to content

Commit

Permalink
git-stash: fix flag parsing
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Brian Gernhardt authored and Junio C Hamano committed Sep 27, 2010
1 parent 3fcb887 commit 9027fa9
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 8 deletions.
15 changes: 11 additions & 4 deletions git-stash.sh
Original file line number Diff line number Diff line change
Expand Up @@ -264,18 +264,25 @@ 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

FLAGS=
while test $# -ne 0
do
case "$1" in
-q|--quiet)
GIT_QUIET=-t
;;
--index)
INDEX_OPTION=--index
;;
Expand Down
8 changes: 4 additions & 4 deletions t/t3903-stash.sh
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ test_expect_success 'stash branch - stashes on stack, stash-like argument' '
test $(git ls-files --modified | wc -l) -eq 1
'

test_expect_failure 'stash show - stashes on stack, stash-like argument' '
test_expect_success 'stash show - stashes on stack, stash-like argument' '
git stash clear &&
test_when_finished "git reset --hard HEAD" &&
git reset --hard &&
Expand All @@ -424,7 +424,7 @@ test_expect_failure 'stash show - stashes on stack, stash-like argument' '
test_cmp expected actual
'

test_expect_failure 'stash show -p - stashes on stack, stash-like argument' '
test_expect_success 'stash show -p - stashes on stack, stash-like argument' '
git stash clear &&
test_when_finished "git reset --hard HEAD" &&
git reset --hard &&
Expand All @@ -447,7 +447,7 @@ test_expect_failure 'stash show -p - stashes on stack, stash-like argument' '
test_cmp expected actual
'

test_expect_failure 'stash show - no stashes on stack, stash-like argument' '
test_expect_success 'stash show - no stashes on stack, stash-like argument' '
git stash clear &&
test_when_finished "git reset --hard HEAD" &&
git reset --hard &&
Expand All @@ -462,7 +462,7 @@ test_expect_failure 'stash show - no stashes on stack, stash-like argument' '
test_cmp expected actual
'

test_expect_failure 'stash show -p - no stashes on stack, stash-like argument' '
test_expect_success 'stash show -p - no stashes on stack, stash-like argument' '
git stash clear &&
test_when_finished "git reset --hard HEAD" &&
git reset --hard &&
Expand Down

0 comments on commit 9027fa9

Please sign in to comment.