From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Oct 2025 17:29:31 +0000 (-0700)
Subject: Merge branch 'kn/refs-files-case-insensitive' into maint-2.51
X-Git-Tag: v2.51.1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff8ef0f9f350330d7a8572a0220f921c42ab33ca;p=thirdparty%2Fgit.git

Merge branch 'kn/refs-files-case-insensitive' into maint-2.51

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
---

ff8ef0f9f350330d7a8572a0220f921c42ab33ca