mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
remote: 'show' and 'prune' can take more than one remote
The 'git remote show' and 'prune' subcommands are documented as taking only a single remote name argument, but that is not the case; they will simply iterate the action over all remotes given. Update the documentation and tests to match. With the last user of the -f flag gone, we also remove the code supporting it. Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
2d2e3d2559
commit
b17dd3f9d6
|
@ -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
|
||||
|
|
|
@ -1009,12 +1009,7 @@ test_expect_success 'extra args: setup' '
|
|||
'
|
||||
|
||||
test_extra_arg () {
|
||||
expect="success"
|
||||
if test "z$1" = "z-f"; then
|
||||
expect=failure
|
||||
shift
|
||||
fi
|
||||
test_expect_$expect "extra args: $*" "
|
||||
test_expect_success "extra args: $*" "
|
||||
test_must_fail git remote $* bogus_extra_arg 2>actual &&
|
||||
grep '^usage:' actual
|
||||
"
|
||||
|
@ -1026,8 +1021,8 @@ 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
|
||||
test_extra_arg -f show origin
|
||||
test_extra_arg -f prune origin
|
||||
# show takes any number of args
|
||||
# prune takes any number of args
|
||||
# update takes any number of args
|
||||
|
||||
test_done
|
||||
|
|
Loading…
Reference in a new issue