diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-02-16 15:04:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-16 15:04:55 -0800 |
| commit | eb0bcd0fbe34befe7648a398efc7f4156b07da48 (patch) | |
| tree | 997b4970db45623e0267704c81a130202cb86c0e /t | |
| parent | Remove hyphen from "git-command" in two error messages (diff) | |
| parent | dwim_ref: fix dangling symref warning (diff) | |
| download | tgif-eb0bcd0fbe34befe7648a398efc7f4156b07da48.tar.xz | |
Merge branch 'maint-1.6.5' into maint-1.6.6
* maint-1.6.5:
dwim_ref: fix dangling symref warning
stash pop: remove 'apply' options during 'drop' invocation
diff: make sure --output=/bad/path is caught
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3903-stash.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 5514f74b30..476e5ec038 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -194,6 +194,15 @@ test_expect_success 'pop -q is quiet' ' test ! -s output.out ' +test_expect_success 'pop -q --index works and is quiet' ' + echo foo > file && + git add file && + git stash save --quiet && + git stash pop -q --index > output.out 2>&1 && + test foo = "$(git show :file)" && + test ! -s output.out +' + test_expect_success 'drop -q is quiet' ' git stash && git stash drop -q > output.out 2>&1 && |