This adds one test or comment for each subcommand of git-remote
according to its current documentation.  All but 'set-branches' and
'update' are listed as taking only a fixed number of arguments; for
those we can write a test with one more (bogus) argument, and see if
the command notices that.

They fail on several counts: 'add' does not check for extra arguments,
and 'show' and 'prune' actually iterate over remotes (i.e., take any
number of args).  We'll fix them in the next two patches.

The -f machinery is only there to make the tests readable while still
ensuring they pass as a whole, and will be removed in the final patch.

Signed-off-by: Thomas Rast <>
 t/ | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/t/ b/t/
index 6579a86..764ee97 100755
--- a/t/
+++ b/t/
@@ -1003,4 +1003,31 @@ 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 () {
+       expect="success"
+       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 &&
+               grep '^usage:' actual
+       "
+test_extra_arg -f 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
+test_extra_arg -f show origin
+test_extra_arg -f prune origin
+# update takes any number of args

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to