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 branch 'en/merge-ort-align-verbosity-with-recursive'

Browse source 
Align the level of verbose output from the ort backend during inner
merge to that of the recursive backend.

* en/merge-ort-align-verbosity-with-recursive:
  merge-ort: exclude messages from inner merges by default
This commit is contained in:
Junio C Hamano 2022-03-13 22:56:17 +00:00
parent f62106d750 624a93507e
commit 8b44e05abf
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)
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 */
if (opt->priv->call_depth && opt->verbosity < 5)
return; /* Ignore messages from inner merges */
sb = strmap_get(&opt->priv->output, path);
if (!sb) {
sb = xmalloc(sizeof(*sb));