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

diff --git a/t/t5404-tracking-branches.sh b/t/t5404-tracking-branches.sh
index 64fe2615acbd3368536b8a79c0b707561b3e16bd..2b8c0bac7db47ef7b37024ecea95ed0e37d5364f 100755 (executable)
--- a/t/t5404-tracking-branches.sh
+++ b/t/t5404-tracking-branches.sh
@@ -35,7 +35,9 @@ test_expect_success 'prepare pushable branches' '
        git commit -a -m aa-master
 '
 
-test_expect_success 'mixed-success push returns error' '! git push'
+test_expect_success 'mixed-success push returns error' '
+       test_must_fail git push origin :
+'
 
 test_expect_success 'check tracking branches updated correctly after push' '
        test "$(git rev-parse origin/master)" = "$(git rev-parse master)"