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

diff --git a/t/t5517-push-mirror.sh b/t/t5517-push-mirror.sh
index e2ad2605084194868fc23e23fec1636af622b47f..12a5dfb17e0a0bd4d0d9636ff13bf44999f78e36 100755 (executable)
--- a/t/t5517-push-mirror.sh
+++ b/t/t5517-push-mirror.sh
@@ -256,7 +256,7 @@ test_expect_success 'remote.foo.mirror=no has no effect' '
                git branch keep master &&
                git push --mirror up &&
                git branch -D keep &&
-               git push up
+               git push up :
        ) &&
        (
                cd mirror &&