From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Jun 2024 16:19:58 +0000 (-0700)
Subject: Merge branch 'kz/merge-fail-early-upon-refresh-failure'
X-Git-Tag: v2.46.0-rc0~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c0bfce914f951d673af91f0cad733b0d465fafb;p=thirdparty%2Fgit.git

Merge branch 'kz/merge-fail-early-upon-refresh-failure'

When "git merge" sees that the index cannot be refreshed (e.g. due
to another process doing the same in the background), it died but
after writing MERGE_HEAD etc. files, which was useless for the
purpose to recover from the failure.

* kz/merge-fail-early-upon-refresh-failure:
  merge: avoid write merge state when unable to write index
---

6c0bfce914f951d673af91f0cad733b0d465fafb