зеркало из https://github.com/microsoft/git.git
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
This commit is contained in:
Коммит
c259a1a927
|
@ -18,8 +18,8 @@ SYNOPSIS
|
|||
'git remote set-url' [--push] <name> <newurl> [<oldurl>]
|
||||
'git remote set-url --add' [--push] <name> <newurl>
|
||||
'git remote set-url --delete' [--push] <name> <url>
|
||||
'git remote' [-v | --verbose] 'show' [-n] <name>
|
||||
'git remote prune' [-n | --dry-run] <name>
|
||||
'git remote' [-v | --verbose] 'show' [-n] <name>...
|
||||
'git remote prune' [-n | --dry-run] <name>...
|
||||
'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]
|
||||
|
||||
DESCRIPTION
|
||||
|
|
|
@ -178,7 +178,7 @@ static int add(int argc, const char **argv)
|
|||
argc = parse_options(argc, argv, NULL, options, builtin_remote_add_usage,
|
||||
0);
|
||||
|
||||
if (argc < 2)
|
||||
if (argc != 2)
|
||||
usage_with_options(builtin_remote_add_usage, options);
|
||||
|
||||
if (mirror && master)
|
||||
|
|
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче