From 9027fa9eb7df606b6658dd48a40bb993ce222ddd Mon Sep 17 00:00:00 2001 From: Brian Gernhardt Date: Fri, 24 Sep 2010 18:15:34 -0400 Subject: 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 Signed-off-by: Junio C Hamano --- t/t3903-stash.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 't') diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index e8a7338862..9ed2396e29 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 && -- cgit v1.2.1