Merge branch 'tr/log-full-diff-keep-true-parents' into maint

diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh
index c2f25039e811c0c35c6258d76829a4fb394982fb..4e911fb43d8ea2c699b3a836547b618274db6e05 100755 (executable)
--- a/t/t1006-cat-file.sh
+++ b/t/t1006-cat-file.sh
@@ -72,6 +72,12 @@ $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
+    '
 }
 
 hello_content="Hello World"