summaryrefslogtreecommitdiffstats
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-01 21:45:14 +0200
committerJunio C Hamano <gitster@pobox.com>2015-06-01 21:45:14 +0200
commitf693bb0bb0d18d6150d6059dfad5018501a9713a (patch)
tree53c5daaee141a48f062343143bf2b5e3df870227 /t
parentMerge branch 'da/mergetool-winmerge' (diff)
parentstash: recognize "--help" for subcommands (diff)
downloadgit-f693bb0bb0d18d6150d6059dfad5018501a9713a.tar.xz
git-f693bb0bb0d18d6150d6059dfad5018501a9713a.zip
Merge branch 'jk/stash-options'
Make "git stash something --help" error out, so that users can safely say "git stash drop --help". * jk/stash-options: stash: recognize "--help" for subcommands stash: complain about unknown flags
Diffstat (limited to 't')
-rwxr-xr-xt/t3903-stash.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 0746eeeff7..7396ca9911 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -100,6 +100,10 @@ test_expect_success 'unstashing in a subdirectory' '
)
'
+test_expect_success 'stash drop complains of extra options' '
+ test_must_fail git stash drop --foo
+'
+
test_expect_success 'drop top stash' '
git reset --hard &&
git stash list > stashlist1 &&