Commit 9027fa9e authored by Brian Gernhardt's avatar Brian Gernhardt Committed by Junio C Hamano

git-stash: fix flag parsing

Currently git-stash uses `git rev-parse --no-revs -- "[email protected]"` to set its
FLAGS variable.  This is the same as `FLAGS="-- [email protected]"`.  It should use
`git rev-parse --no-revs --flags "[email protected]"`, but that eats any "-q" or
"--quiet" argument.  So move the check for quiet before rev-parse.
Signed-off-by: Brian Gernhardt's avatarBrian Gernhardt <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 3fcb8878
......@@ -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 "[email protected]" 2>/dev/null)
FLAGS=$(git rev-parse --no-revs -- "[email protected]" 2>/dev/null)
FLAGS=$(git rev-parse --no-revs --flags "[email protected]" 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
;;
......
......@@ -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 &&
......@@ -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 &&
......@@ -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 &&
......@@ -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 &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment