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>
Elijah Newren committed
Mar 13, 2025 at 02:46 UTC
3965976edb5b8693cbecfd39ad8438eec311403b
1 file changed
+6
-2
merge-ort-wrappers.c
+6
-2
@@ -33,6 +33,7 @@ int merge_ort_nonrecursive(struct merge_options *opt,
33
struct tree *merge_base)
34
{
35
struct merge_result result;
36
+ int show_msgs;
37
38
if (unclean(opt, head))
39
return -1;
@@ -42,9 +43,10 @@ int merge_ort_nonrecursive(struct merge_options *opt,
43
return 1;
44
}
45
46
+ show_msgs = !!opt->verbosity;
47
memset(&result, 0, sizeof(result));
48
merge_incore_nonrecursive(opt, merge_base, head, merge, &result);
47
- merge_switch_to_result(opt, head, &result, 1, 1);
49
+ merge_switch_to_result(opt, head, &result, 1, show_msgs);
50
51
return result.clean;
52
}
@@ -57,13 +59,15 @@ int merge_ort_recursive(struct merge_options *opt,
59
{
60
struct tree *head = repo_get_commit_tree(opt->repo, side1);
61
struct merge_result tmp;
62
+ int show_msgs;
63
64
if (unclean(opt, head))
65
return -1;
66
67
+ show_msgs = !!opt->verbosity;
68
memset(&tmp, 0, sizeof(tmp));
69
merge_incore_recursive(opt, merge_bases, side1, side2, &tmp);
66
- merge_switch_to_result(opt, head, &tmp, 1, 1);
70
+ merge_switch_to_result(opt, head, &tmp, 1, show_msgs);
71
*result = NULL;
72
73
return tmp.clean;