diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-10-15 10:29:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-15 10:29:28 -0700 |
| commit | 0949f24eb4f0d1286496fd4cf3bf60f419d22b50 (patch) | |
| tree | 2c94bfe732fb47a7a0b9570c8c2e21f8aa149f86 /csum-file.c | |
| parent | Merge branch 'dl/push-missing-object-error' into maint-2.51 (diff) | |
| parent | merge-ort: fix directory rename on top of source of other rename/delete (diff) | |
| download | git-0949f24eb4f0d1286496fd4cf3bf60f419d22b50.tar.gz git-0949f24eb4f0d1286496fd4cf3bf60f419d22b50.zip | |
Merge branch 'en/ort-rename-fixes' into maint-2.51
Various bugs about rename handling in "ort" merge strategy have
been fixed.
* en/ort-rename-fixes:
merge-ort: fix directory rename on top of source of other rename/delete
merge-ort: fix incorrect file handling
merge-ort: clarify the interning of strings in opt->priv->path
t6423: fix missed staging of file in testcases 12i,12j,12k
t6423: document two bugs with rename-to-self testcases
merge-ort: drop unnecessary temporary in check_for_directory_rename()
merge-ort: update comments to modern testfile location
Diffstat (limited to 'csum-file.c')
0 files changed, 0 insertions, 0 deletions