]> git.ipfire.org Git - thirdparty/git.git/commit - merge-ort.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8adffaa) | patch
merge-ort: step 1 of tree writing -- record basenames, modes, and oids
authorElijah Newren <newren@gmail.com>
Sun, 13 Dec 2020 08:04:20 +0000 (08:04 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Dec 2020 22:18:20 +0000 (14:18 -0800)
commita9945bba600914bc8feb7aa52dce7b8e41237649
tree77d838a9e8f48f909e455532fe3dfb7e076f08d1tree | snapshot
parent8adffaa818d17595b23959e995ad395c8cd0b0becommit | diff
merge-ort: step 1 of tree writing -- record basenames, modes, and oids

As a step towards transforming the processed path->conflict_info entries
into an actual tree object, start recording basenames, modes, and oids
in a dir_metadata structure.  Subsequent commits will make use of this
to actually write a tree.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-ort.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.