]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d486ca6 ee02ac6)
Merge branch 'zh/cat-file-batch-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Jul 2021 23:52:49 +0000 (16:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Jul 2021 23:52:49 +0000 (16:52 -0700)
"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

1  2 
t/t1006-cat-file.sh patch | diff1 | diff2 | blob | history

diff --cc t/t1006-cat-file.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.