merge-ort: mark conflict/warning messages from inner merges as omittable
A recursive merge involves merging the merge bases of the two branches being merged. Such an inner merge can itself generate conflict notices. While such notices may be useful when initially trying to create a merge, they seem to just be noise when investigating merges later with --remerge-diff. (Especially when both sides of the outer merge resolved the conflict the same way leading to no overall conflict.) Remove them. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Feb 2, 2022 at 02:37 UTC
0d83d8240ddb3f54da44563b73527dbc50c4ed22
1 file changed
+3
-1
merge-ort.c
+3
-1
@@ -638,7 +638,9 @@ static void path_msg(struct merge_options *opt,
638
struct strbuf tmp = STRBUF_INIT;
639
640
if (opt->record_conflict_msgs_as_headers && omittable_hint)
641
- return; /* Do not record mere hints in tree */
641
+ return; /* Do not record mere hints in headers */
642
+ if (opt->record_conflict_msgs_as_headers && opt->priv->call_depth)
643
+ return; /* Do not record inner merge issues in headers */
644
sb = strmap_get(&opt->priv->output, path);
645
if (!sb) {
646
sb = xmalloc(sizeof(*sb));