diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-10-15 10:29:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-15 10:29:31 -0700 |
| commit | ff8ef0f9f350330d7a8572a0220f921c42ab33ca (patch) | |
| tree | 9735e838c8346faaebe45378a3488c1b3a107078 /commit.c | |
| parent | Merge branch 'pw/rebase-i-cleanup-fix' into maint-2.51 (diff) | |
| parent | refs/files: handle D/F conflicts during locking (diff) | |
| download | git-ff8ef0f9f350330d7a8572a0220f921c42ab33ca.tar.gz git-ff8ef0f9f350330d7a8572a0220f921c42ab33ca.zip | |
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
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions