undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-ort: exclude messages from inner merges by default

Browse Source 
merge-recursive would only report messages from inner merges when the
GIT_MERGE_VERBOSITY was set to 5.  Do the same for merge-ort.

Note that somewhat reverts 0d83d8240d ("merge-ort: mark conflict/warning
messages from inner merges as omittable", 2022-02-02) based on two
facts:

  * This commit basically removes the showing of messages from inner
    merges as well, at least by default.  The only difference is that
    users can request to get them back by turning up the verbosity.
  * Messages from inner merges are specially annotated since 4a3d86e1bb
    ("merge-ort: make informational messages from recursive merges
    clearer", 2022-02-17).  The ability to distinguish them from outer
    merge comments make them less problematic to include, and easier
    for humans to parse.

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-03-02 04:19:21 +00:00 committed by Junio C Hamano
parent 715d08a9e5
commit 624a93507e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
merge-ort.c
View File

@ -639,8 +639,9 @@ static void path_msg(struct merge_options *opt,
if (opt->record_conflict_msgs_as_headers && omittable_hint) if (opt->record_conflict_msgs_as_headers && omittable_hint)
return; /* Do not record mere hints in headers */ return; /* Do not record mere hints in headers */
if (opt->record_conflict_msgs_as_headers && opt->priv->call_depth) if (opt->priv->call_depth && opt->verbosity < 5)
return; /* Do not record inner merge issues in headers */ return; /* Ignore messages from inner merges */
sb = strmap_get(&opt->priv->output, path); sb = strmap_get(&opt->priv->output, path);
if (!sb) { if (!sb) {
sb = xmalloc(sizeof(*sb)); sb = xmalloc(sizeof(*sb));