merge-ort: drop unnecessary show_all_errors from collect_merge_info()

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> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Elijah Newren committed Jun 14, 2026 at 06:37 UTC 159e4d903458ac3ec0aa944aefeadbaf9e83b73c
1 file changed -1
merge-ort.c
-1
@@ -1740,7 +1740,6 @@ static int collect_merge_info(struct merge_options *opt,
1740 setup_traverse_info(&info, opt->priv->toplevel_dir);
1741 info.fn = collect_merge_info_callback;
1742 info.data = opt;
1743 - info.show_all_errors = 1;
1743
1744 if (repo_parse_tree(opt->repo, merge_base) < 0 ||
1745 repo_parse_tree(opt->repo, side1) < 0 ||