From 09322b1da92fd32204c8b4b07cf12decccfe47f3 Mon Sep 17 00:00:00 2001 From: Sergey Organov Date: Mon, 21 Dec 2020 18:19:38 +0300 Subject: diff-merges: new function diff_merges_suppress() This function sets all the relevant flags to disabled state, so that no code that checks only one of them get it wrong. Then we call this new function everywhere where diff merges output suppression is needed. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano --- diff-merges.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'diff-merges.h') diff --git a/diff-merges.h b/diff-merges.h index 243ef915c4..a031240576 100644 --- a/diff-merges.h +++ b/diff-merges.h @@ -13,6 +13,8 @@ void diff_merges_init_revs(struct rev_info *revs); int diff_merges_parse_opts(struct rev_info *revs, const char **argv); +void diff_merges_suppress(struct rev_info *revs); + void diff_merges_default_to_first_parent(struct rev_info *revs); void diff_merges_default_to_dense_combined(struct rev_info *revs); -- cgit v1.2.3