development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge-ort: mark conflict/warning messages from inner merges as omittable

Browse source 
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>
This commit is contained in:
Elijah Newren 2022-02-02 02:37:36 +00:00 committed by Junio C Hamano
parent 20323d104e
commit 0d83d8240d
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
merge-ort.c
View file

@ -638,7 +638,9 @@ static void path_msg(struct merge_options *opt,
struct strbuf tmp = STRBUF_INIT;
if (opt->record_conflict_msgs_as_headers && omittable_hint)
return; /* Do not record mere hints in tree */
return; /* Do not record mere hints in headers */
if (opt->record_conflict_msgs_as_headers && opt->priv->call_depth)
return; /* Do not record inner merge issues in headers */
sb = strmap_get(&opt->priv->output, path);
if (!sb) {
sb = xmalloc(sizeof(*sb));