Use reflog in 'pull --rebase . foo'

diff --git a/t/t1303-wacky-config.sh b/t/t1303-wacky-config.sh
index f366b53fb671a5ef52c34516bc4ab3869a142d8e..080117c6bcbb61078539f36011ecd62780bae305 100755 (executable)
--- a/t/t1303-wacky-config.sh
+++ b/t/t1303-wacky-config.sh
@@ -10,8 +10,8 @@ setup() {
 
 check() {
        echo "$2" >expected
-       git config --get "$1" >actual
-       git diff actual expected
+       git config --get "$1" >actual 2>&1
+       test_cmp actual expected
 }
 
 test_expect_success 'modify same key' '
@@ -35,9 +35,16 @@ test_expect_success 'add key in different section' '
 '
 
 SECTION="test.q\"s\\sq'sp e.key"
-test_expect_success 'make sure git-config escapes section names properly' '
+test_expect_success 'make sure git config escapes section names properly' '
        git config "$SECTION" bar &&
        check "$SECTION" bar
 '
 
+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"
+'
+
 test_done