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>

diff --git a/git-stash.sh b/git-stash.sh
index 7ce818bd1baecfb48447f862bb2654ccbd3cf2ff..57f36ce8dd7cd25e269f8e31d6fdc668d62811f9 100755 (executable)
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -264,8 +264,18 @@ parse_flags_and_rev()
        b_tree=
        i_tree=
 
        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)
        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
        do
                case "$1" in
        while test $# -ne 0
        do
                case "$1" in

-                       -q|--quiet)
-                               GIT_QUIET=-t
-                       ;;

                        --index)
                                INDEX_OPTION=--index
                        ;;
                        --index)
                                INDEX_OPTION=--index
                        ;;

diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index e8a7338862b472a1eeb0a54313e897fcd209741e..9ed2396e29fb6f573f32e12c1dd4182086d60b04 100755 (executable)
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -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 &&
        test_when_finished "git reset --hard HEAD" &&
        git reset --hard &&
        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_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 &&
        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_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 &&
        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_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 &&
        git stash clear &&
        test_when_finished "git reset --hard HEAD" &&
        git reset --hard &&