mirror of
https://github.com/git/git.git
synced 2024-05-24 03:46:12 +02:00
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>
This commit is contained in:
parent
3fcb88785d
commit
9027fa9eb7
15
git-stash.sh
15
git-stash.sh
|
@ -264,8 +264,18 @@ parse_flags_and_rev()
|
||||||
b_tree=
|
b_tree=
|
||||||
i_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)
|
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
|
set -- $FLAGS
|
||||||
|
|
||||||
|
@ -273,9 +283,6 @@ parse_flags_and_rev()
|
||||||
while test $# -ne 0
|
while test $# -ne 0
|
||||||
do
|
do
|
||||||
case "$1" in
|
case "$1" in
|
||||||
-q|--quiet)
|
|
||||||
GIT_QUIET=-t
|
|
||||||
;;
|
|
||||||
--index)
|
--index)
|
||||||
INDEX_OPTION=--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 $(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 &&
|
git stash clear &&
|
||||||
test_when_finished "git reset --hard HEAD" &&
|
test_when_finished "git reset --hard HEAD" &&
|
||||||
git reset --hard &&
|
git reset --hard &&
|
||||||
|
@ -424,7 +424,7 @@ test_expect_failure 'stash show - stashes on stack, stash-like argument' '
|
||||||
test_cmp expected actual
|
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 &&
|
git stash clear &&
|
||||||
test_when_finished "git reset --hard HEAD" &&
|
test_when_finished "git reset --hard HEAD" &&
|
||||||
git reset --hard &&
|
git reset --hard &&
|
||||||
|
@ -447,7 +447,7 @@ test_expect_failure 'stash show -p - stashes on stack, stash-like argument' '
|
||||||
test_cmp expected actual
|
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 &&
|
git stash clear &&
|
||||||
test_when_finished "git reset --hard HEAD" &&
|
test_when_finished "git reset --hard HEAD" &&
|
||||||
git reset --hard &&
|
git reset --hard &&
|
||||||
|
@ -462,7 +462,7 @@ test_expect_failure 'stash show - no stashes on stack, stash-like argument' '
|
||||||
test_cmp expected actual
|
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 &&
|
git stash clear &&
|
||||||
test_when_finished "git reset --hard HEAD" &&
|
test_when_finished "git reset --hard HEAD" &&
|
||||||
git reset --hard &&
|
git reset --hard &&
|
||||||
|
|
Loading…
Reference in New Issue