From: Jon Seymour <jon.seymour@gmail.com>
Date: Sat, 25 Sep 2010 02:58:24 GMT
Subject: Re: [PATCH] git-stash: fix flag parsing
Message-ID: <AANLkTim_sNJYRuAB35GTT-2YXY9oJ8rEWsCgO8qv-6nf@mail.gmail.com>
In-Reply-To: <1285366534-10490-1-git-send-email-brian@gernhardtsoftware.com>

Thanks Brian. I've submitted what I hope is the simplest possible
rectification of my regression - apologies for not catching this
myself!

jon.

On Sat, Sep 25, 2010 at 8:15 AM, Brian Gernhardt
<brian@gernhardtsoftware.com> wrote:
> 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>
> ---
>
>  Not the most elegant solution, but it works.
>
>  I think we want to add the ability for git rev-parse to understand
>  `git rev-parse --no-revs --flags -- "$@"`, but I'm not sure if that
>  would break anything else and don't have the time to do it right now.
>
>  (This time with the right CC list.)
>
>  git-stash.sh     |   15 +++++++++++----
>  t/t3903-stash.sh |    8 ++++----
>  2 files changed, 15 insertions(+), 8 deletions(-)
>
> diff --git a/git-stash.sh b/git-stash.sh
> index 7ce818b..b44da41 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
>                        ;;
> diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
> index e8a7338..9ed2396 100755
> --- 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_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 &&
> --
> 1.7.3.234.g7bba3
>
>