diff options
| author | Elijah Newren <newren@gmail.com> | 2020-12-13 08:04:20 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-13 14:18:20 -0800 |
| commit | a9945bba600914bc8feb7aa52dce7b8e41237649 (patch) | |
| tree | 77d838a9e8f48f909e455532fe3dfb7e076f08d1 /builtin/diff-index.c | |
| parent | 8adffaa818d17595b23959e995ad395c8cd0b0be (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>
Diffstat (limited to 'builtin/diff-index.c')
0 files changed, 0 insertions, 0 deletions