Merge branch 'maint'

diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh
index 979624d0dc7a2973919b55ba6fe462dde34f3952..83a8e14c6c385d6d6fbdd179d30018128e8a200f 100755 (executable)
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@ -111,7 +111,7 @@ Merge the remote changes before pushing again.  See the '"'non-fast-forward'"'
 section of '"'git push --help'"' for details." output
 '
 
-test_expect_failure 'push fails for non-fast-forward refs unmatched by remote helper' '
+test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper' '
        # create a dissimilarly-named remote ref so that git is unable to match the
        # two refs (viz. local, remote) unless an explicit refspec is provided.
        git push origin master:retsam