diff options
| author | Elijah Newren <newren@gmail.com> | 2021-01-01 02:34:46 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-04 10:40:45 -0800 |
| commit | 70f19c7fced2ec49fd9bca827370835d84d782c7 (patch) | |
| tree | 02cacd4c2cea1d63a4c4cee27cc68dd3c862008b | |
| parent | merge-ort: copy and adapt merge_submodule() from merge-recursive.c (diff) | |
| download | git-70f19c7fced2ec49fd9bca827370835d84d782c7.tar.gz git-70f19c7fced2ec49fd9bca827370835d84d782c7.zip | |
merge-ort: implement format_commit()
This implementation is based on a mixture of print_commit() and
output_commit_title() from merge-recursive.c so that it can be used to
take over both functions.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | merge-ort.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/merge-ort.c b/merge-ort.c index 2dfab1858f..bf704bcd34 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -328,7 +328,19 @@ static void format_commit(struct strbuf *sb, int indent, struct commit *commit) { - die("Not yet implemented."); + struct merge_remote_desc *desc; + struct pretty_print_context ctx = {0}; + ctx.abbrev = DEFAULT_ABBREV; + + strbuf_addchars(sb, ' ', indent); + desc = merge_remote_util(commit); + if (desc) { + strbuf_addf(sb, "virtual %s\n", desc->name); + return; + } + + format_commit_message(commit, "%h %s", sb, &ctx); + strbuf_addch(sb, '\n'); } __attribute__((format (printf, 4, 5))) |