[PATCH 2/5] merge-ort: drop unnecessary show_all_errors from collect_merge_info()
- From
Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Apr 21, 2026, 00:26 UTC
- Message-ID
- <949b5d8e3f3aefd9497a7b85d860259b9d5db418.1776731171.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.2096.git.1776731171.gitgitgadget@gmail.com>
From: Elijah Newren <newren@gmail.com>
collect_merge_info() has set info.show_all_errors = 1 since d2bc1994f363 (merge-ort: implement a very basic collect_merge_info(), 2020-12-13). This setting was copied from unpack-trees.c where it controls batching of error messages for porcelain display, but merge-ort has no such error-batching logic and never needed it.
With show_all_errors set, traverse_trees() captures a negative callback return but continues processing remaining entries rather than stopping immediately. Removing the setting restores the default behavior where a negative return from collect_merge_info_callback() breaks out of the traversal loop right away, allowing a future commit to exit early when a corrupt tree is detected.
Signed-off-by: Elijah Newren <newren@gmail.com> --- merge-ort.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/merge-ort.c b/merge-ort.c index 4b8e32209d..74e9636020 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -1740,7 +1740,6 @@ static int collect_merge_info(struct merge_options *opt, setup_traverse_info(&info, opt->priv->toplevel_dir); info.fn = collect_merge_info_callback; info.data = opt; - info.show_all_errors = 1; if (repo_parse_tree(opt->repo, merge_base) < 0 || repo_parse_tree(opt->repo, side1) < 0 ||
-- gitgitgadget