Merge branch 'rs/commit-m-no-edit' into maint

diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 07eb378922ac8fbfef715d30ab119f7f18f7950c..dd10ff053ce28ff2ef092e7b0740c809ba64f5b9 100755 (executable)
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -345,7 +345,7 @@ test_expect_success 'fetch mirrors do not act as mirrors during push' '
        ) &&
        (cd mirror-fetch/child &&
         git branch -m renamed renamed2 &&
-        git push parent
+        git push parent :
        ) &&
        (cd mirror-fetch/parent &&
         git rev-parse --verify renamed &&
@@ -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