freshlybakedca.ke / git
Git fork
fork atom

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>

authored by

Elijah Newren and committed by
Junio C Hamano 3965976e a707d4f9

+6 -2
unified split
+6 -2
merge-ort-wrappers.c
··· 33 struct tree *merge_base) 34 { 35 struct merge_result result; 36 37 if (unclean(opt, head)) 38 return -1; ··· 42 return 1; 43 } 44 45 memset(&result, 0, sizeof(result)); 46 merge_incore_nonrecursive(opt, merge_base, head, merge, &result); 47 - merge_switch_to_result(opt, head, &result, 1, 1); 48 49 return result.clean; 50 } ··· 57 { 58 struct tree *head = repo_get_commit_tree(opt->repo, side1); 59 struct merge_result tmp; 60 61 if (unclean(opt, head)) 62 return -1; 63 64 memset(&tmp, 0, sizeof(tmp)); 65 merge_incore_recursive(opt, merge_bases, side1, side2, &tmp); 66 - merge_switch_to_result(opt, head, &tmp, 1, 1); 67 *result = NULL; 68 69 return tmp.clean;
··· 33 struct tree *merge_base) 34 { 35 struct merge_result result; 36 + int show_msgs; 37 38 if (unclean(opt, head)) 39 return -1; ··· 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); 49 + merge_switch_to_result(opt, head, &result, 1, show_msgs); 50 51 return result.clean; 52 } ··· 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); 70 + merge_switch_to_result(opt, head, &tmp, 1, show_msgs); 71 *result = NULL; 72 73 return tmp.clean;