diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-05-01 15:24:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-01 15:24:01 -0700 |
| commit | c259a1a927016fa5b80e3a7055031430cbdfddb8 (patch) | |
| tree | 841a389391b80df690c30fb64792a068c49940fc /t | |
| parent | Merge branch 'zk/prompt-rebase-step' (diff) | |
| parent | remote: 'show' and 'prune' can take more than one remote (diff) | |
| download | tgif-c259a1a927016fa5b80e3a7055031430cbdfddb8.tar.xz | |
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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5505-remote.sh | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 6579a86724..dd10ff053c 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -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 |