Merge branch 'dk/send-email-avoid-net-smtp-ssl-when-able' into maint

diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 867704a64280eb1905fcc2e88ac9b4a337584785..13b7851f7c2feb87f63449d917380452e85c1f84 100755 (executable)
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -1539,7 +1539,7 @@ test_expect_success !MINGW '--show-origin blob ref' '
        test_cmp expect output
 '
 
-test_expect_failure '--local requires a repo' '
+test_expect_success '--local requires a repo' '
        # we expect 128 to ensure that we do not simply
        # fail to find anything and return code "1"
        test_expect_code 128 nongit git config --local foo.bar