From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Jul 2021 23:52:49 +0000 (-0700)
Subject: Merge branch 'zh/cat-file-batch-fix'
X-Git-Tag: v2.33.0-rc0~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d96bcbc0602f96ccee3111ff93b05389cd6eae6;p=thirdparty%2Fgit.git

Merge branch 'zh/cat-file-batch-fix'

"git cat-file --batch-all-objects"" misbehaved when "--batch" is in
use and did not ask for certain object traits.

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

5d96bcbc0602f96ccee3111ff93b05389cd6eae6