From: Sergey Organov <sorganov@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Sergey Organov <sorganov@gmail.com>
Subject: [PATCH 2/3] diff-merges: cleanup set_diff_merges()
Date: Wed, 14 Sep 2022 22:31:01 +0300 [thread overview]
Message-ID: <20220914193102.5275-3-sorganov@gmail.com> (raw)
In-Reply-To: <20220914193102.5275-1-sorganov@gmail.com>
Get rid of special-casing of 'suppress' in set_diff_merges(). Instead
set 'merges_need_diff' flag correctly in every option handling
function.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
---
diff-merges.c | 30 +++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/diff-merges.c b/diff-merges.c
index 780ed08fc87f..85cbefa5afd7 100644
--- a/diff-merges.c
+++ b/diff-merges.c
@@ -20,9 +20,20 @@ static void suppress(struct rev_info *revs)
revs->remerge_diff = 0;
}
+static void common_setup(struct rev_info *revs)
+{
+ suppress(revs);
+ revs->merges_need_diff = 1;
+}
+
+static void set_none(struct rev_info *revs)
+{
+ suppress(revs);
+}
+
static void set_separate(struct rev_info *revs)
{
- suppress(revs);
+ common_setup(revs);
revs->separate_merges = 1;
revs->simplify_history = 0;
}
@@ -35,21 +46,21 @@ static void set_first_parent(struct rev_info *revs)
static void set_combined(struct rev_info *revs)
{
- suppress(revs);
+ common_setup(revs);
revs->combine_merges = 1;
revs->dense_combined_merges = 0;
}
static void set_dense_combined(struct rev_info *revs)
{
- suppress(revs);
+ common_setup(revs);
revs->combine_merges = 1;
revs->dense_combined_merges = 1;
}
static void set_remerge_diff(struct rev_info *revs)
{
- suppress(revs);
+ common_setup(revs);
revs->remerge_diff = 1;
revs->simplify_history = 0;
}
@@ -57,7 +68,7 @@ static void set_remerge_diff(struct rev_info *revs)
static diff_merges_setup_func_t func_by_opt(const char *optarg)
{
if (!strcmp(optarg, "off") || !strcmp(optarg, "none"))
- return suppress;
+ return set_none;
if (!strcmp(optarg, "1") || !strcmp(optarg, "first-parent"))
return set_first_parent;
if (!strcmp(optarg, "separate"))
@@ -81,10 +92,6 @@ static void set_diff_merges(struct rev_info *revs, const char *optarg)
die(_("invalid value for '%s': '%s'"), "--diff-merges", optarg);
func(revs);
-
- /* NOTE: the merges_need_diff flag is cleared by func() call */
- if (func != suppress)
- revs->merges_need_diff = 1;
}
/*
@@ -115,6 +122,7 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
if (!suppress_m_parsing && !strcmp(arg, "-m")) {
set_to_default(revs);
+ revs->merges_need_diff = 0;
} else if (!strcmp(arg, "-c")) {
set_combined(revs);
revs->merges_imply_patch = 1;
@@ -125,7 +133,7 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
set_remerge_diff(revs);
revs->merges_imply_patch = 1;
} else if (!strcmp(arg, "--no-diff-merges")) {
- suppress(revs);
+ set_none(revs);
} else if (!strcmp(arg, "--combined-all-paths")) {
revs->combined_all_paths = 1;
} else if ((argcount = parse_long_opt("diff-merges", argv, &optarg))) {
@@ -139,7 +147,7 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
void diff_merges_suppress(struct rev_info *revs)
{
- suppress(revs);
+ set_none(revs);
}
void diff_merges_default_to_first_parent(struct rev_info *revs)
--
2.25.1
next prev parent reply other threads:[~2022-09-14 19:31 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-14 19:30 [PATCH 0/3] diff-merges: minor cleanups Sergey Organov
2022-09-14 19:31 ` [PATCH 1/3] diff-merges: cleanup func_by_opt() Sergey Organov
2022-09-15 18:47 ` Junio C Hamano
2022-09-16 13:01 ` Sergey Organov
2022-09-16 16:14 ` Junio C Hamano
2022-09-16 16:28 ` Sergey Organov
2022-09-14 19:31 ` Sergey Organov [this message]
2022-09-15 20:41 ` [PATCH 2/3] diff-merges: cleanup set_diff_merges() Junio C Hamano
2022-09-16 13:38 ` Sergey Organov
2022-09-14 19:31 ` [PATCH 3/3] diff-merges: clarify log.diffMerges documentation Sergey Organov
2022-09-15 18:43 ` Junio C Hamano
2022-09-16 13:46 ` Sergey Organov
2022-09-16 16:21 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220914193102.5275-3-sorganov@gmail.com \
--to=sorganov@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).