]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1e1586e 2e5a636)
Merge branch 'kz/merge-fail-early-upon-refresh-failure'
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2024 16:19:58 +0000 (09:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2024 16:19:58 +0000 (09:19 -0700)
commit6c0bfce914f951d673af91f0cad733b0d465fafb
treea706b53af1a3cc7d333bb9fb278c90f158ae5db9tree | snapshot
parent1e1586e4ed626bde864339c10570bc0e73f0ab97commit | diff
parent2e5a63659301c46544fdb3c3e7a69b4693a2c384commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.