From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Oct 2023 20:25:42 +0000 (-0700)
Subject: Merge branch 'jc/merge-ort-attr-index-fix'
X-Git-Tag: v2.43.0-rc0~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7906b5c957b239c4332efb8eb183673cdf952f2f;p=thirdparty%2Fgit.git

Merge branch 'jc/merge-ort-attr-index-fix'

Fix "git merge-tree" to stop segfaulting when the --attr-source
option is used.

* jc/merge-ort-attr-index-fix:
  merge-ort: initialize repo in index state
---

7906b5c957b239c4332efb8eb183673cdf952f2f