From: Derrick Stolee <derrickstolee@github.com>
To: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH] merge-ort: exclude messages from inner merges by default
Date: Wed, 2 Mar 2022 09:08:36 -0500 [thread overview]
Message-ID: <b584336f-460e-bfe7-2d61-6e253ec599e3@github.com> (raw)
In-Reply-To: <pull.1167.git.1646194761463.gitgitgadget@gmail.com>
On 3/1/2022 11:19 PM, Elijah Newren via GitGitGadget wrote:
> From: Elijah Newren <newren@gmail.com>
>
> 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:
Makes sense.
> - 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 */
> +
Exactly matches your intentions. Excellent.
It might be nice to have a test that demonstrates this
verbosity, but I'm not going to block this patch on that.
Thanks,
-Stolee
prev parent reply other threads:[~2022-03-02 14:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-02 4:19 [PATCH] merge-ort: exclude messages from inner merges by default Elijah Newren via GitGitGadget
2022-03-02 14:08 ` Derrick Stolee [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b584336f-460e-bfe7-2d61-6e253ec599e3@github.com \
--to=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=newren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).