git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] merge-ort: exclude messages from inner merges by default

From
Derrick Stolee <derrickstolee@github.com>
Date
Mar 2, 2022, 14:08 UTC
Message-ID
<b584336f-460e-bfe7-2d61-6e253ec599e3@github.com>
In-Reply-To
<pull.1167.git.1646194761463.gitgitgadget@gmail.com>
On 3/1/2022 11:19 PM, Elijah Newren via GitGitGadget wrote:
Show 8 quoted lines
> 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.
Show 5 quoted lines
> -	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

Previous: Elijah Newren via GitGitGadget
Message 2 of 2 in “merge-ort: exclude messages from inner merges by default”
  1. merge-ort: exclude messages from inner merges by defaultElijah Newren via GitGitGadget, Mar 2, 2022
  2. Derrick StoleeMar 2, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.