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>

diff --git a/merge-ort-wrappers.c b/merge-ort-wrappers.c
index 62834c30e9e5a3d37d023d0dc819e46a82d88151..c54d56b34465bf322f99ccc859193f8ab515ebaa 100644 (file)
--- a/merge-ort-wrappers.c
+++ b/merge-ort-wrappers.c
@@ -33,6 +33,7 @@ int merge_ort_nonrecursive(struct merge_options *opt,
                           struct tree *merge_base)
 {
        struct merge_result result;
+       int show_msgs;
 
        if (unclean(opt, head))
                return -1;
@@ -42,9 +43,10 @@ int merge_ort_nonrecursive(struct merge_options *opt,
                return 1;
        }
 
+       show_msgs = !!opt->verbosity;
        memset(&result, 0, sizeof(result));
        merge_incore_nonrecursive(opt, merge_base, head, merge, &result);
-       merge_switch_to_result(opt, head, &result, 1, 1);
+       merge_switch_to_result(opt, head, &result, 1, show_msgs);
 
        return result.clean;
 }
@@ -57,13 +59,15 @@ int merge_ort_recursive(struct merge_options *opt,
 {
        struct tree *head = repo_get_commit_tree(opt->repo, side1);
        struct merge_result tmp;
+       int show_msgs;
 
        if (unclean(opt, head))
                return -1;
 
+       show_msgs = !!opt->verbosity;
        memset(&tmp, 0, sizeof(tmp));
        merge_incore_recursive(opt, merge_bases, side1, side2, &tmp);
-       merge_switch_to_result(opt, head, &tmp, 1, 1);
+       merge_switch_to_result(opt, head, &tmp, 1, show_msgs);
        *result = NULL;
 
        return tmp.clean;