diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-03-26 16:26:10 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-03-26 16:26:11 +0900 |
| commit | 52241c96c7514b837233336033b8edc20f8ea0e8 (patch) | |
| tree | 4793a79217697ef05544108934b3d85a887438df /refs/files-backend.c | |
| parent | Merge branch 'ua/some-builtins-wo-the-repository' (diff) | |
| parent | merge-ort: fix slightly overzealous assertion for rename-to-self (diff) | |
| download | git-52241c96c7514b837233336033b8edc20f8ea0e8.tar.gz git-52241c96c7514b837233336033b8edc20f8ea0e8.zip | |
Merge branch 'en/merge-process-renames-crash-fix'
The merge-recursive and merge-ort machinery crashed in corner cases
when certain renames are involved.
* en/merge-process-renames-crash-fix:
merge-ort: fix slightly overzealous assertion for rename-to-self
t6423: add a testcase causing a failed assertion in process_renames
Diffstat (limited to 'refs/files-backend.c')
0 files changed, 0 insertions, 0 deletions