]> git.ipfire.org Git - thirdparty/git.git/commit
merge-ort: drop unnecessary show_all_errors from collect_merge_info()
authorElijah Newren <newren@gmail.com>
Sun, 14 Jun 2026 06:37:23 +0000 (06:37 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Jun 2026 14:50:47 +0000 (07:50 -0700)
commit159e4d903458ac3ec0aa944aefeadbaf9e83b73c
tree5691c6c5610d01caedbd7cb805bcce5baf34602d
parentda80feb5be9076bb56af0681d684c36028f92ae6
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