From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 1 Jul 2021 19:16:34 +0000 (-0700)
Subject: Merge branch 'zh/cat-file-batch-fix' into zh/ref-filter-raw-data
X-Git-Tag: v2.34.0-rc0~246^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bff9703f0a851d968a1ac60bc7cdc44e9a290652;p=thirdparty%2Fgit.git

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
---

bff9703f0a851d968a1ac60bc7cdc44e9a290652