diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-07-18 20:31:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-07-18 20:31:56 (GMT) |
| commit | e3349f288826d54ee056330222a902360c192b0b (patch) | |
| tree | fe892a39a65b5184034908eee55cf4cf1334f5cf /builtin/fetch.c | |
| parent | 3d3874d537af1149c85b73d7c4317ed1b0d0b419 (diff) | |
| parent | 751e16542472c7040565f97c2149c2d501ed0b81 (diff) | |
| download | git-e3349f288826d54ee056330222a902360c192b0b.zip git-e3349f288826d54ee056330222a902360c192b0b.tar.gz git-e3349f288826d54ee056330222a902360c192b0b.tar.bz2 | |
Merge branch 'en/merge-dual-dir-renames-fix'
Fixes a long-standing corner case bug around directory renames in
the merge-ort strategy.
* en/merge-dual-dir-renames-fix:
merge-ort: fix issue with dual rename and add/add conflict
merge-ort: shuffle the computation and cleanup of potential collisions
merge-ort: make a separate function for freeing struct collisions
merge-ort: small cleanups of check_for_directory_rename
t6423: add tests of dual directory rename plus add/add conflict
Diffstat (limited to 'builtin/fetch.c')
0 files changed, 0 insertions, 0 deletions