| commit | c73cda76b104795d1455ecbf031a18045ab37a84 | |
| author | Elijah Newren <newren@gmail.com> | |
| Fri, 1 Jan 2021 02:34:45 +0000 (1 02:34 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 4 Jan 2021 18:40:45 +0000 (4 10:40 -0800) | ||
| tree | bc472f3808d3c1cf3edfc4f8ba4987e672a9fce2 | treesnapshot (tar.gz zip) |
| parent | f591c4724615b2fc1e4dc3d6bfe5da96a88eacbe | commitdiff |
merge-ort: copy and adapt merge_submodule() from merge-recursive.c
Take merge_submodule() from merge-recursive.c and make slight
adjustments, predominantly around deferring output using path_msg()
instead of using merge-recursive's output() and show() functions.
There's also a fix for recursive cases (when call_depth > 0) and a
slight change to argument order for find_first_merges().
find_first_merges() and format_commit() are left unimplemented for
now, but will be added by subsequent commits.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Take merge_submodule() from merge-recursive.c and make slight
adjustments, predominantly around deferring output using path_msg()
instead of using merge-recursive's output() and show() functions.
There's also a fix for recursive cases (when call_depth > 0) and a
slight change to argument order for find_first_merges().
find_first_merges() and format_commit() are left unimplemented for
now, but will be added by subsequent commits.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-ort.c | diffblobblamehistory |