Merge branch 'jc/strbuf-branchname-fix' into maint

diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh
index 1947c28c6466d46c79c7b1b093488c1620324172..8c16e045a0c585957a0be4e31b5628d1d5b6cb23 100755 (executable)
--- a/t/t5531-deep-submodule-push.sh
+++ b/t/t5531-deep-submodule-push.sh
@@ -16,6 +16,7 @@ test_expect_success setup '
                (
                        cd gar/bage &&
                        git init &&
+                       git config push.default matching &&
                        >junk &&
                        git add junk &&
                        git commit -m "Initial junk"