aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-02-16 15:05:02 -0800
committerJunio C Hamano <gitster@pobox.com>2010-02-16 15:05:02 -0800
commite7b3cea0f7589c57f7bb808330e32bdd7f901c95 (patch)
treef5612fd7df20b7d7273ddf44b30117e6eb1764a9 /t
parentb599672316ae0e0cf827e5e2cd6d3bb403d7b8cd (diff)
parenteb0bcd0fbe34befe7648a398efc7f4156b07da48 (diff)
downloadgit-e7b3cea0f7589c57f7bb808330e32bdd7f901c95.tar.gz
git-e7b3cea0f7589c57f7bb808330e32bdd7f901c95.tar.xz
Merge branch 'maint-1.6.6' into maint
* maint-1.6.6: 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-xt/t3903-stash.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 5514f74b3..476e5ec03 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 &&