merge-ort: implement a very basic collect_merge_info()
authorElijah Newren <redacted>
Sun, 13 Dec 2020 08:04:13 +0000 (08:04 +0000)
committerJunio C Hamano <redacted>
Sun, 13 Dec 2020 22:18:19 +0000 (14:18 -0800)
commitd2bc1994f363ac2049da0cdd0b8a7bed61eeaab0
tree62c3225db628425c2a0eb1c385d718ee0baf61ad
parent0c0d705b5cba39c70b01b8b21e2c4d3ca014daf3
merge-ort: implement a very basic collect_merge_info()

This does not actually collect any necessary info other than the
pathnames involved, since it just allocates an all-zero conflict_info
and stuffs that into paths.  However, it invokes the traverse_trees()
machinery to walk over all the paths and sets up the basic
infrastructure we need.

I have left out a few obvious optimizations to try to make this patch as
short and obvious as possible.  A subsequent patch will add some of
those back in with some more useful data fields before we introduce a
patch that actually sets up the conflict_info fields.

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