Merge branch 'zh/cat-file-batch-fix' into zh/ref-filter-raw-data

* zh/cat-file-batch-fix: cat-file: merge two block into one cat-file: handle trivial --batch format with --batch-all-objects