{"thread":{"id":"57494","subject":"[PATCH] merge-ort: exclude messages from inner merges by default","startedAt":"2022-03-02T04:19:32Z","lastAt":"2022-03-02T14:09:07Z","messageCount":2,"participants":["Elijah Newren via GitGitGadget","Derrick Stolee"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"450051","messageId":"pull.1167.git.1646194761463.gitgitgadget@gmail.com","threadId":"57494","inReplyTo":null,"subject":"[PATCH] merge-ort: exclude messages from inner merges by default","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2022-03-02T04:19:21Z","receivedAt":"2022-03-02T04:19:32Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren <newren@gmail.com>\n\nmerge-recursive would only report messages from inner merges when the\nGIT_MERGE_VERBOSITY was set to 5.  Do the same for merge-ort.\n\nNote that somewhat reverts 0d83d8240d (\"merge-ort: mark conflict/warning\nmessages from inner merges as omittable\", 2022-02-02) based on two\nfacts:\n\n  * This commit basically removes the showing of messages from inner\n    merges as well, at least by default.  The only difference is that\n    users can request to get them back by turning up the verbosity.\n  * Messages from inner merges are specially annotated since 4a3d86e1bb\n    (\"merge-ort: make informational messages from recursive merges\n    clearer\", 2022-02-17).  The ability to distinguish them from outer\n    merge comments make them less problematic to include, and easier\n    for humans to parse.\n\nSigned-off-by: Elijah Newren <newren@gmail.com>\n---\n    merge-ort: exclude messages from inner merges by default\n    \n    cf. https://lore.kernel.org/git/xmqqwnheuq79.fsf@gitster.g/\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1167%2Fnewren%2Fmerge-ort-squelch-inner-msgs-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1167/newren/merge-ort-squelch-inner-msgs-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1167\n\n merge-ort.c | 5 +++--\n 1 file changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/merge-ort.c b/merge-ort.c\nindex 55decb2587e..be85273c727 100644\n--- a/merge-ort.c\n+++ b/merge-ort.c\n@@ -639,8 +639,9 @@ static void path_msg(struct merge_options *opt,\n \n \tif (opt->record_conflict_msgs_as_headers && omittable_hint)\n \t\treturn; /* Do not record mere hints in headers */\n-\tif (opt->record_conflict_msgs_as_headers && opt->priv->call_depth)\n-\t\treturn; /* Do not record inner merge issues in headers */\n+\tif (opt->priv->call_depth && opt->verbosity < 5)\n+\t\treturn; /* Ignore messages from inner merges */\n+\n \tsb = strmap_get(&opt->priv->output, path);\n \tif (!sb) {\n \t\tsb = xmalloc(sizeof(*sb));\n\nbase-commit: 715d08a9e51251ad8290b181b6ac3b9e1f9719d7\n-- \ngitgitgadget\n"},{"id":"450104","messageId":"b584336f-460e-bfe7-2d61-6e253ec599e3@github.com","threadId":"57494","inReplyTo":"pull.1167.git.1646194761463.gitgitgadget@gmail.com","subject":"Re: [PATCH] merge-ort: exclude messages from inner merges by default","fromName":"Derrick Stolee","fromEmail":"derrickstolee@github.com","sentAt":"2022-03-02T14:08:36Z","receivedAt":"2022-03-02T14:09:07Z","isPatch":true,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"On 3/1/2022 11:19 PM, Elijah Newren via GitGitGadget wrote:\n> From: Elijah Newren <newren@gmail.com>\n> \n> merge-recursive would only report messages from inner merges when the\n> GIT_MERGE_VERBOSITY was set to 5.  Do the same for merge-ort.\n> \n> Note that somewhat reverts 0d83d8240d (\"merge-ort: mark conflict/warning\n> messages from inner merges as omittable\", 2022-02-02) based on two\n> facts:\n\nMakes sense.\n\n> -\tif (opt->record_conflict_msgs_as_headers && opt->priv->call_depth)\n> -\t\treturn; /* Do not record inner merge issues in headers */\n> +\tif (opt->priv->call_depth && opt->verbosity < 5)\n> +\t\treturn; /* Ignore messages from inner merges */\n> +\n\nExactly matches your intentions. Excellent.\n\nIt might be nice to have a test that demonstrates this\nverbosity, but I'm not going to block this patch on that.\n\nThanks,\n-Stolee\n\n"}]}