diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index e8c396b5f..7a6f35468 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -18,8 +18,8 @@ SYNOPSIS 'git remote set-url' [--push] [] 'git remote set-url --add' [--push] 'git remote set-url --delete' [--push] -'git remote' [-v | --verbose] 'show' [-n] -'git remote prune' [-n | --dry-run] +'git remote' [-v | --verbose] 'show' [-n] ... +'git remote prune' [-n | --dry-run] ... 'git remote' [-v | --verbose] 'update' [-p | --prune] [( | )...] DESCRIPTION diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 07eb37892..8b411eb66 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