admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge-ort: support having merge verbosity be set to 0

Browse Source 
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>
This commit is contained in:
Elijah Newren
2025-03-13 02:46:38 +00:00
committed by Junio C Hamano
parent a707d4f941
commit 3965976edb
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
merge-ort-wrappers.c
View File

@@ -33,6 +33,7 @@ int merge_ort_nonrecursive(struct merge_options *opt,
struct tree *merge_base) struct tree *merge_base)
{ {
struct merge_result result; struct merge_result result;
int show_msgs;
if (unclean(opt, head)) if (unclean(opt, head))
return -1; return -1;
@@ -42,9 +43,10 @@ int merge_ort_nonrecursive(struct merge_options *opt,
return 1; return 1;
} }
show_msgs = !!opt->verbosity;
memset(&result, 0, sizeof(result)); memset(&result, 0, sizeof(result));
merge_incore_nonrecursive(opt, merge_base, head, merge, &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; 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 tree *head = repo_get_commit_tree(opt->repo, side1);
struct merge_result tmp; struct merge_result tmp;
int show_msgs;
if (unclean(opt, head)) if (unclean(opt, head))
return -1; return -1;
show_msgs = !!opt->verbosity;
memset(&tmp, 0, sizeof(tmp)); memset(&tmp, 0, sizeof(tmp));
merge_incore_recursive(opt, merge_bases, side1, side2, &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; *result = NULL;
return tmp.clean; return tmp.clean;