diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2022-03-13 22:56:17 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-03-13 22:56:17 +0000 |
| commit | 8b44e05abf256c5c43116b983719cafca2934952 (patch) | |
| tree | 79d894b78d49a2d1be1123ad62b27d0720444f91 | |
| parent | Merge branch 'ab/make-optim-noop' (diff) | |
| parent | merge-ort: exclude messages from inner merges by default (diff) | |
| download | tgif-8b44e05abf256c5c43116b983719cafca2934952.tar.xz | |
Merge branch 'en/merge-ort-align-verbosity-with-recursive'
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
| -rw-r--r-- | merge-ort.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/merge-ort.c b/merge-ort.c index ff739d4b36..97da477c7e 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -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)); |