]> git.ipfire.org Git - thirdparty/git.git/commit
merge-ort: drop unnecessary show_all_errors from collect_merge_info()
authorElijah Newren <newren@gmail.com>
Tue, 21 Apr 2026 00:26:08 +0000 (00:26 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Apr 2026 23:22:19 +0000 (16:22 -0700)
commit399bf79b7b76b1b408bfe68dd2dd3432c6497a67
tree5691c6c5610d01caedbd7cb805bcce5baf34602d
parentf7a69261db0f268de967919fa1b7a226571069a9
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>
merge-ort.c