Fourth batch

diff --git a/t/t1307-config-blob.sh b/t/t1307-config-blob.sh
index fdc257e66fdc121b9f125466bf38431e3233dd19..37dc689d8c98fd776895e1ce6d18faee092001d3 100755 (executable)
--- a/t/t1307-config-blob.sh
+++ b/t/t1307-config-blob.sh
@@ -61,10 +61,20 @@ test_expect_success 'parse errors in blobs are properly attributed' '
        git commit -m broken &&
 
        test_must_fail git config --blob=HEAD:config some.value 2>err &&
+       test_i18ngrep "HEAD:config" err
+'
+
+test_expect_success 'can parse blob ending with CR' '
+       printf "[some]key = value\\r" >config &&
+       git add config &&
+       git commit -m CR &&
+       echo value >expect &&
+       git config --blob=HEAD:config some.key >actual &&
+       test_cmp expect actual
+'
 
-       # just grep for our token as the exact error message is likely to
-       # change or be internationalized
-       grep "HEAD:config" err
+test_expect_success 'config --blob outside of a repository is an error' '
+       test_must_fail nongit git config --blob=foo --list
 '
 
 test_done