summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-05-03 15:12:38 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-05-03 15:12:38 -0700
commit571cdfd4e0a4cc24e215a5d5f0cb24292a9d7929 (patch)
tree72084fb42ecc467bdff4ba4878f312d94411be23 /t
parentMerge branch 'jn/glossary-revision' into maint (diff)
parentremote: 'show' and 'prune' can take more than one remote (diff)
downloadtgif-571cdfd4e0a4cc24e215a5d5f0cb24292a9d7929.tar.xz
Merge branch 'tr/remote-tighten-commandline-parsing' into maint
* tr/remote-tighten-commandline-parsing: remote: 'show' and 'prune' can take more than one remote remote: check for superfluous arguments in 'git remote add' remote: add a test for extra arguments, according to docs
Diffstat (limited to 't')
-rwxr-xr-xt/t5505-remote.sh22
1 files changed, 22 insertions, 0 deletions
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index ccc55ebf4b..8b411eb666 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -1003,4 +1003,26 @@ test_expect_success 'remote set-url --delete baz' '
cmp expect actual
'
+test_expect_success 'extra args: setup' '
+ # add a dummy origin so that this does not trigger failure
+ git remote add origin .
+'
+
+test_extra_arg () {
+ test_expect_success "extra args: $*" "
+ test_must_fail git remote $* bogus_extra_arg 2>actual &&
+ grep '^usage:' actual
+ "
+}
+
+test_extra_arg add nick url
+test_extra_arg rename origin newname
+test_extra_arg remove origin
+test_extra_arg set-head origin master
+# set-branches takes any number of args
+test_extra_arg set-url origin newurl oldurl
+# show takes any number of args
+# prune takes any number of args
+# update takes any number of args
+
test_done