diff options
| author | Sergey Organov <sorganov@gmail.com> | 2020-12-21 15:19:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-21 21:47:31 (GMT) |
| commit | 09322b1da92fd32204c8b4b07cf12decccfe47f3 (patch) | |
| tree | 74698f04a0722bf2ab75f8af317b9225ba414860 /fmt-merge-msg.c | |
| parent | 564a4fc8471b41fc05bda16e4bbb02a99b515cbf (diff) | |
| download | git-09322b1da92fd32204c8b4b07cf12decccfe47f3.zip git-09322b1da92fd32204c8b4b07cf12decccfe47f3.tar.gz git-09322b1da92fd32204c8b4b07cf12decccfe47f3.tar.bz2 | |
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 <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fmt-merge-msg.c')
| -rw-r--r-- | fmt-merge-msg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c index bd22e1e..abc3403 100644 --- a/fmt-merge-msg.c +++ b/fmt-merge-msg.c @@ -2,6 +2,7 @@ #include "refs.h" #include "object-store.h" #include "diff.h" +#include "diff-merges.h" #include "revision.h" #include "tag.h" #include "string-list.h" @@ -668,7 +669,7 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out, head = lookup_commit_or_die(&head_oid, "HEAD"); repo_init_revisions(the_repository, &rev, NULL); rev.commit_format = CMIT_FMT_ONELINE; - rev.ignore_merges = 1; + diff_merges_suppress(&rev); rev.limited = 1; strbuf_complete_line(out); |