Merge branch 'mm/color-auto-default'

diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh
index c2f25039e811c0c35c6258d76829a4fb394982fb..d499d02a29f3ec5fb15d86835d24ccabd322df56 100755 (executable)
--- a/t/t1006-cat-file.sh
+++ b/t/t1006-cat-file.sh
@@ -72,6 +72,19 @@ $content"
        echo_without_newline $sha1 | git cat-file --batch-check >actual &&
        test_cmp expect actual
     '
+
+    test_expect_success "custom --batch-check format" '
+       echo "$type $sha1" >expect &&
+       echo $sha1 | git cat-file --batch-check="%(objecttype) %(objectname)" >actual &&
+       test_cmp expect actual
+    '
+
+    test_expect_success '--batch-check with %(rest)' '
+       echo "$type this is some extra content" >expect &&
+       echo "$sha1    this is some extra content" |
+               git cat-file --batch-check="%(objecttype) %(rest)" >actual &&
+       test_cmp expect actual
+    '
 }
 
 hello_content="Hello World"