mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2013-05-01 15:24:01 -07:00
parent b9347eb224 b17dd3f9d6
commit c259a1a927
3 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
t/t5505-remote.sh
View File

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