]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'kn/refs-files-case-insensitive' into maint-2.51
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Oct 2025 17:29:31 +0000 (10:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Oct 2025 17:29:31 +0000 (10:29 -0700)
commitff8ef0f9f350330d7a8572a0220f921c42ab33ca
tree9735e838c8346faaebe45378a3488c1b3a107078
parentac57c870aaaf2b7964d4f2d8f607f16a22fba608
parent948b2ab0d88770368a7fed5a651c17db1c7f9b28
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
refs.c
refs.h
refs/files-backend.c