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@xxxxxxxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxxxxxxx> > --- > > Â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 > > -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html