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

remote: 'show' and 'prune' can take more than one remote

Browse Source 
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:
Thomas Rast
2013-04-24 15:54:37 +02:00
committed by Junio C Hamano
parent 2d2e3d2559
commit b17dd3f9d6
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-remote.txt
View File

@ -18,8 +18,8 @@ SYNOPSIS
'git remote set-url' [--push] <name> <newurl> [<oldurl>] 'git remote set-url' [--push] <name> <newurl> [<oldurl>]
'git remote set-url --add' [--push] <name> <newurl> 'git remote set-url --add' [--push] <name> <newurl>
'git remote set-url --delete' [--push] <name> <url> 'git remote set-url --delete' [--push] <name> <url>
'git remote' [-v | --verbose] 'show' [-n] <name> 'git remote' [-v | --verbose] 'show' [-n] <name>...
'git remote prune' [-n | --dry-run] <name> 'git remote prune' [-n | --dry-run] <name>...
'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...] 'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]
DESCRIPTION DESCRIPTION

11
t/t5505-remote.sh
View File

@ -1009,12 +1009,7 @@ test_expect_success 'extra args: setup' '
' '
test_extra_arg () { test_extra_arg () {
expect="success" test_expect_success "extra args: $*" "
if test "z$1" = "z-f"; then
expect=failure
shift
fi
test_expect_$expect "extra args: $*" "
test_must_fail git remote $* bogus_extra_arg 2>actual && test_must_fail git remote $* bogus_extra_arg 2>actual &&
grep '^usage:' actual grep '^usage:' actual
" "
@ -1026,8 +1021,8 @@ test_extra_arg remove origin
test_extra_arg set-head origin master test_extra_arg set-head origin master
# set-branches takes any number of args # set-branches takes any number of args
test_extra_arg set-url origin newurl oldurl test_extra_arg set-url origin newurl oldurl
test_extra_arg -f show origin # show takes any number of args
test_extra_arg -f prune origin # prune takes any number of args
# update takes any number of args # update takes any number of args
test_done test_done