summaryrefslogtreecommitdiff
path: root/t/t3903-stash.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-02-16 23:04:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-02-16 23:04:55 (GMT)
commiteb0bcd0fbe34befe7648a398efc7f4156b07da48 (patch)
tree997b4970db45623e0267704c81a130202cb86c0e /t/t3903-stash.sh
parent7283bbc70a55d7364fbeaefc1009c03fcfc8d929 (diff)
parent003c6abdb27c367747847a76b0a7890d67c794be (diff)
downloadgit-eb0bcd0fbe34befe7648a398efc7f4156b07da48.zip
git-eb0bcd0fbe34befe7648a398efc7f4156b07da48.tar.gz
git-eb0bcd0fbe34befe7648a398efc7f4156b07da48.tar.bz2
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/t3903-stash.sh')
-rwxr-xr-xt/t3903-stash.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 5514f74..476e5ec 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 &&