diff options
| author | Brian Gernhardt <brian@gernhardtsoftware.com> | 2010-09-24 18:15:34 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-26 21:27:37 -0700 |
| commit | 9027fa9eb7df606b6658dd48a40bb993ce222ddd (patch) | |
| tree | ff216c0ddd51651f61aeb8127d7a2d4bec6f0088 /t/t3903-stash.sh | |
| parent | 3fcb88785da831ad7d53cf18b4398099179c9c87 (diff) | |
| download | git-9027fa9eb7df606b6658dd48a40bb993ce222ddd.tar.gz | |
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>
Diffstat (limited to 't/t3903-stash.sh')
| -rwxr-xr-x | t/t3903-stash.sh | 8 |
1 files changed, 4 insertions, 4 deletions
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 && |