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 /builtin/count-objects.c | |
| parent | Merge branch 'jk/color-variable-fixes' (diff) | |
| parent | refs/files: handle D/F conflicts during locking (diff) | |
| download | git-96ed0a89066c2ea57c18b6586b2cab2edc333515.tar.gz git-96ed0a89066c2ea57c18b6586b2cab2edc333515.zip | |
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 'builtin/count-objects.c')
0 files changed, 0 insertions, 0 deletions