From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Mar 2024 23:59:41 +0000 (-0800)
Subject: Merge branch 'js/merge-tree-3-trees'
X-Git-Tag: v2.45.0-rc0~132
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae46d5fb98b316767f51a82fc0c1441174995a34;p=thirdparty%2Fgit.git

Merge branch 'js/merge-tree-3-trees'

"git merge-tree" has learned that the three trees involved in the
3-way merge only need to be trees, not necessarily commits.

* js/merge-tree-3-trees:
  fill_tree_descriptor(): mark error message for translation
  cache-tree: avoid an unnecessary check
  Always check `parse_tree*()`'s return value
  t4301: verify that merge-tree fails on missing blob objects
  merge-ort: do check `parse_tree()`'s return value
  merge-tree: fail with a non-zero exit code on missing tree objects
  merge-tree: accept 3 trees as arguments
---

ae46d5fb98b316767f51a82fc0c1441174995a34