Merge branch 'jc/maint-checkout-keep-remove' into maint

diff --git a/t/t1303-wacky-config.sh b/t/t1303-wacky-config.sh
index 99985dcd79f12d680c51e8f64d61c47a70b43f36..1983076c753ea12a4f69d2a98eda3c1621daed59 100755 (executable)
--- a/t/t1303-wacky-config.sh
+++ b/t/t1303-wacky-config.sh
@@ -11,7 +11,7 @@ setup() {
 check() {
        echo "$2" >expected
        git config --get "$1" >actual
-       git diff actual expected
+       test_cmp actual expected
 }
 
 test_expect_success 'modify same key' '
@@ -34,4 +34,10 @@ test_expect_success 'add key in different section' '
        check section2.key bar
 '
 
+SECTION="test.q\"s\\sq'sp e.key"
+test_expect_success 'make sure git config escapes section names properly' '
+       git config "$SECTION" bar &&
+       check "$SECTION" bar
+'
+
 test_done