diff options
| author | Thomas Rast <trast@inf.ethz.ch> | 2013-04-24 15:54:37 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-24 13:13:21 -0700 |
| commit | b17dd3f9d6b1657b3fbfb40a863fc2dce5f54798 (patch) | |
| tree | e75903a0b2f839dbfcd1d8d612bcef1210e32383 | |
| parent | 2d2e3d25595c1bcd2259db5eb7604f196d35949f (diff) | |
| download | git-b17dd3f9d6b1657b3fbfb40a863fc2dce5f54798.tar.gz | |
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>
| -rw-r--r-- | Documentation/git-remote.txt | 4 | ||||
| -rwxr-xr-x | t/t5505-remote.sh | 11 |
2 files changed, 5 insertions, 10 deletions
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index e8c396b5f9..7a6f354680 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -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 diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 07eb378922..8b411eb666 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -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 |