diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-02-17 09:40:45 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-17 09:40:45 +0300 |
| commit | 72cd63c008c673e185740a694cdf3e85711df3d2 (patch) | |
| tree | 769aa7f5f340d15e71777eb6337bb711b2f5630e /t | |
| parent | 7e5eb8f1834722507e2d2171a253b78b1d924458 (diff) | |
| parent | d3f69766c431bab6321fed1ce64d914dc44ff87f (diff) | |
Merge branch 'maint'
* maint:
Prepare 1.7.0.1 release notes
Fix use of mutex in threaded grep
dwim_ref: fix dangling symref warning
stash pop: remove 'apply' options during 'drop' invocation
diff: make sure --output=/bad/path is caught
Remove hyphen from "git-command" in two error messages
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 && |