From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Oct 2022 00:11:34 +0000 (-0700)
Subject: Merge branch 'js/merge-ort-in-read-only-repo' into maint-2.38
X-Git-Tag: v2.39.0-rc0~82^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bcf22f29df87f25582de0ac9274d1567fa16be6f;p=thirdparty%2Fgit.git

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

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
---

bcf22f29df87f25582de0ac9274d1567fa16be6f