diff options
| -rw-r--r-- | builtin/merge-tree.c | 3 | ||||
| -rw-r--r-- | merge-ort.c | 22 | ||||
| -rw-r--r-- | merge-ort.h | 1 |
3 files changed, 23 insertions, 3 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index c61b5b4a10..b3c5692498 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -468,7 +468,8 @@ static int real_merge(struct merge_tree_options *o, } if (o->show_messages) { putchar(line_termination); - merge_display_update_messages(&opt, &result); + merge_display_update_messages(&opt, line_termination == '\0', + &result); } merge_finalize(&opt, &result); return !result.clean; /* result.clean < 0 handled above */ diff --git a/merge-ort.c b/merge-ort.c index 6081b29705..01f150ef3b 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -4413,6 +4413,7 @@ static int record_conflicted_index_entries(struct merge_options *opt) } void merge_display_update_messages(struct merge_options *opt, + int detailed, struct merge_result *result) { struct merge_options_internal *opti = result->priv; @@ -4438,8 +4439,25 @@ void merge_display_update_messages(struct merge_options *opt, /* Iterate over the items, printing them */ for (int path_nr = 0; path_nr < olist.nr; ++path_nr) { struct string_list *conflicts = olist.items[path_nr].util; - for (int i = 0; i < conflicts->nr; i++) + for (int i = 0; i < conflicts->nr; i++) { + struct logical_conflict_info *info = + conflicts->items[i].util; + + if (detailed) { + printf("%lu", (unsigned long)info->paths.nr); + putchar('\0'); + for (int n = 0; n < info->paths.nr; n++) { + fputs(info->paths.v[n], stdout); + putchar('\0'); + } + fputs(type_short_descriptions[info->type], + stdout); + putchar('\0'); + } puts(conflicts->items[i].string); + if (detailed) + putchar('\0'); + } } string_list_clear(&olist, 0); @@ -4519,7 +4537,7 @@ void merge_switch_to_result(struct merge_options *opt, trace2_region_leave("merge", "write_auto_merge", opt->repo); } if (display_update_msgs) - merge_display_update_messages(opt, result); + merge_display_update_messages(opt, /* detailed */ 0, result); merge_finalize(opt, result); } diff --git a/merge-ort.h b/merge-ort.h index c4909bcbf9..a994c9a5fc 100644 --- a/merge-ort.h +++ b/merge-ort.h @@ -87,6 +87,7 @@ void merge_switch_to_result(struct merge_options *opt, * so only call this when bypassing merge_switch_to_result(). */ void merge_display_update_messages(struct merge_options *opt, + int detailed, struct merge_result *result); struct stage_info { |