diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-09-29 11:40:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-09-29 11:40:35 -0700 |
| commit | 96ed0a89066c2ea57c18b6586b2cab2edc333515 (patch) | |
| tree | 0c169b6991d043f9fdc549b02f345809eb655f4f /diff.h | |
| parent | a89fa2fff2e2e5c13df0caccd913427b5c98a4b4 (diff) | |
| parent | 948b2ab0d88770368a7fed5a651c17db1c7f9b28 (diff) | |
Merge branch 'kn/refs-files-case-insensitive'
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 'diff.h')
0 files changed, 0 insertions, 0 deletions