Merge branch 'jh/checkout-auto-tracking' into maint

diff --git a/t/t1303-wacky-config.sh b/t/t1303-wacky-config.sh
index 080117c6bcbb61078539f36011ecd62780bae305..46103a1591680c9803588d24a135abf79fe64ae9 100755 (executable)
--- a/t/t1303-wacky-config.sh
+++ b/t/t1303-wacky-config.sh
@@ -44,7 +44,7 @@ LONG_VALUE=$(printf "x%01021dx a" 7)
 test_expect_success 'do not crash on special long config line' '
        setup &&
        git config section.key "$LONG_VALUE" &&
-       check section.key "fatal: bad config file line 2 in .git/config"
+       check section.key "$LONG_VALUE"
 '
 
 test_done