Merge branch 'tr/remote-tighten-commandline-parsing'

* 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

diff --combined t/t5505-remote.sh
index 6579a86724cec01b8c731ead2d4083dfe44293dd,8b411eb66649f5a26c2f0e69a5c66cf3a97e30d3..dd10ff053ce28ff2ef092e7b0740c809ba64f5b9
--- 1/t/t5505-remote.sh
--- 2/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@@ -345,7 -345,7 +345,7 @@@ test_expect_success 'fetch mirrors do n
        ) &&
        (cd mirror-fetch/child &&
         git branch -m renamed renamed2 &&
 -       git push parent
 +       git push parent :
        ) &&
        (cd mirror-fetch/parent &&
         git rev-parse --verify renamed &&
@@@ -1003,4 -1003,26 +1003,26 @@@ test_expect_success 'remote set-url --d
        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