Merge branch 'zh/cat-file-batch-fix' into jch
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Jun 2021 02:26:17 +0000 (11:26 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Jun 2021 02:26:17 +0000 (11:26 +0900)
commit4b5114bf9ce897fe0083af5e2f058ca9d3bd8f6c
tree56f532d918d7e53a586aad46e78faa08fec2405e
parentd7c58fb2bc48744b57e805f59e9eee0acad0d209
parentee02ac616435cb1da1e02c8b9c220649d3cec40a
Merge branch 'zh/cat-file-batch-fix' into jch

"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
t/t1006-cat-file.sh