Merge branch 'mk/combine-diff-context-horizon-fix' into maint

diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh
index a3a4e47e1d25379e981373e67124c9efe5c76213..f01edffa3c0babf76593fbd211f6606ff2036c74 100755 (executable)
--- a/t/t5570-git-daemon.sh
+++ b/t/t5570-git-daemon.sh
@@ -8,6 +8,7 @@ LIB_GIT_DAEMON_PORT=${LIB_GIT_DAEMON_PORT-5570}
 start_git_daemon
 
 test_expect_success 'setup repository' '
+       git config push.default matching &&
        echo content >file &&
        git add file &&
        git commit -m one