From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Oct 2022 17:08:43 +0000 (-0700)
Subject: Merge branch 'js/merge-ort-in-read-only-repo'
X-Git-Tag: v2.39.0-rc0~122
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=19118cb8570e499e1a56e81740cee3d1c1206b44;p=thirdparty%2Fgit.git

Merge branch 'js/merge-ort-in-read-only-repo'

In read-only repositories, "git merge-tree" tried to come up with a
merge result tree object, which it failed (which is not wrong) and
led to a segfault (which is bad), which has been corrected.

* js/merge-ort-in-read-only-repo:
  merge-ort: return early when failing to write a blob
  merge-ort: fix segmentation fault in read-only repositories
---

19118cb8570e499e1a56e81740cee3d1c1206b44