From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Jul 2024 18:18:55 +0000 (-0700)
Subject: Merge branch 'en/ort-inner-merge-error-fix'
X-Git-Tag: v2.46.0-rc1~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ffc8f1142c9ecb6f83cffe4c33c6baacf6d38026;p=thirdparty%2Fgit.git

Merge branch 'en/ort-inner-merge-error-fix'

The "ort" merge backend saw one bugfix for a crash that happens
when inner merge gets killed, and assorted code clean-ups.

* en/ort-inner-merge-error-fix:
  merge-ort: fix missing early return
  merge-ort: convert more error() cases to path_msg()
  merge-ort: upon merge abort, only show messages causing the abort
  merge-ort: loosen commented requirements
  merge-ort: clearer propagation of failure-to-function from merge_submodule
  merge-ort: fix type of local 'clean' var in handle_content_merge ()
  merge-ort: maintain expected invariant for priv member
  merge-ort: extract handling of priv member into reusable function
---

ffc8f1142c9ecb6f83cffe4c33c6baacf6d38026