From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 1 May 2013 22:24:01 +0000 (-0700)
Subject: Merge branch 'tr/remote-tighten-commandline-parsing'
X-Git-Tag: v1.8.3-rc1~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c259a1a927016fa5b80e3a7055031430cbdfddb8?ds=inline;hp=-c

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
---

c259a1a927016fa5b80e3a7055031430cbdfddb8
diff --combined t/t5505-remote.sh
index 6579a86724,8b411eb666..dd10ff053c
--- a/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