From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 23 Sep 2025 19:05:33 +0000 (-0700)
Subject: Merge branch 'kn/refs-files-case-insensitive' into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=51c2a665f02bfb88f40dd180dc2fe5a5948f4819;p=thirdparty%2Fgit.git

Merge branch 'kn/refs-files-case-insensitive' into next

Deal more gracefully with directory / file conflicts when the files
backend is used for ref storage, by failing only the ones that are
involved in the conflict while allowing others.

* kn/refs-files-case-insensitive:
  refs/files: handle D/F conflicts during locking
  refs/files: handle F/D conflicts in case-insensitive FS
  refs/files: use correct error type when lock exists
  refs/files: catch conflicts on case-insensitive file-systems
---

51c2a665f02bfb88f40dd180dc2fe5a5948f4819