git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 23366d2)
merge-ort: implement unique_path() helper
authorElijah Newren <redacted>
Fri, 1 Jan 2021 02:34:41 +0000 (02:34 +0000)
committerJunio C Hamano <redacted>
Mon, 4 Jan 2021 18:40:45 +0000 (10:40 -0800)
commit5a1a1e8ea9fdd4a575c711b91f176838ea502e44
tree044e221c821562f97fcb52733815c108991c35f8tree | snapshot
parent23366d2aa97544fe76bc86964f4493b7b89e7b22commit | diff
merge-ort: implement unique_path() helper

Implement unique_path(), based on the one from merge-recursive.c.  It is
simplified, however, due to: (1) using strmaps, and (2) the fact that
merge-ort lets the checkout codepath handle possible collisions with the
working tree means that other code locations don't have to.

Signed-off-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>
merge-ort.c diff | blob | history
git clone https://git.99rst.org/PROJECT