]> git.ipfire.org Git - thirdparty/git.git/commit
merge-ort: support having merge verbosity be set to 0
authorElijah Newren <newren@gmail.com>
Thu, 13 Mar 2025 02:46:38 +0000 (02:46 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Mar 2025 16:48:51 +0000 (09:48 -0700)
commit3965976edb5b8693cbecfd39ad8438eec311403b
tree99bfbc149b021d242d9a46df49668e0bf08fba7a
parenta707d4f941c82759d2eb3f1f89fc1e4232df98d1
merge-ort: support having merge verbosity be set to 0

Various callers such as am & checkout set the merge verbosity to 0 to
avoid having conflict messages printed.  While this could be achieved by
avoiding the wrappers from merge-ort-wrappers and instead passing 0 for
display_update_msgs to merge_switch_to_result(), for simplicity of
converting callers simply allow them to also achieve this with the
merge-ort-wrappers by setting verbosity to 0.

Signed-off-by: Elijah Newren <newren@gmail.com>
Reviewed-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-ort-wrappers.c