]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit5d96bcbc0602f96ccee3111ff93b05389cd6eae6
tree242c2ce22d0e5a6d54ad3a25335466cf3580fde0tree | snapshot
parentd486ca60a51c9cb1fe068803c3f540724e95e83acommit | diff
parentee02ac616435cb1da1e02c8b9c220649d3cec40acommit | diff
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
t/t1006-cat-file.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.