From: Philip Oakley <philipoakley@iee.email>
To: Sergey Organov <sorganov@gmail.com>, Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, Elijah Newren <newren@gmail.com>,
Felipe Contreras <felipe.contreras@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH 1/9] diff-merges: introduce --diff-merges=def
Date: Thu, 8 Apr 2021 12:48:11 +0100 [thread overview]
Message-ID: <f6b25ea6-88b1-c167-7fd4-440be8782fcb@iee.email> (raw)
In-Reply-To: <20210407225608.14611-2-sorganov@gmail.com>
Hi,
On 07/04/2021 23:56, Sergey Organov wrote:
> Introduce the notion of default diff format for merges, and the option
> "def" to select it. The default is "separate" and can't yet be
"def" feels a bit too short and sounds similar to "define" - why not
spell out in full?
> changed, so effectively "dev" is just a synonym for "separate" for
did you mean "def"? i.e. s/dev/def/ (..spell out in full ;-)
--
Philip
> now.
>
> This is in preparation for introducing log.diffMerges configuration
> option that will let --diff-merges=def to be configured to any
> supported format.
>
> Signed-off-by: Sergey Organov <sorganov@gmail.com>
> ---
> diff-merges.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/diff-merges.c b/diff-merges.c
> index 146bb50316a6..0887a07cfc67 100644
> --- a/diff-merges.c
> +++ b/diff-merges.c
> @@ -2,6 +2,8 @@
>
> #include "revision.h"
>
> +typedef void (*diff_merges_setup_func_t)(struct rev_info *);
> +
> static void suppress(struct rev_info *revs)
> {
> revs->separate_merges = 0;
> @@ -19,6 +21,8 @@ static void set_separate(struct rev_info *revs)
> revs->separate_merges = 1;
> }
>
> +static diff_merges_setup_func_t set_to_default = set_separate;
> +
> static void set_first_parent(struct rev_info *revs)
> {
> set_separate(revs);
> @@ -66,6 +70,8 @@ static void set_diff_merges(struct rev_info *revs, const char *optarg)
> set_combined(revs);
> else if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined"))
> set_dense_combined(revs);
> + else if (!strcmp(optarg, "def"))
> + set_to_default(revs);
> else
> die(_("unknown value for --diff-merges: %s"), optarg);
>
next prev parent reply other threads:[~2021-04-08 11:48 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-07 22:55 [PATCH 0/9] git log: configurable default format for merge diffs Sergey Organov
2021-04-07 22:56 ` [PATCH 1/9] diff-merges: introduce --diff-merges=def Sergey Organov
2021-04-08 11:48 ` Philip Oakley [this message]
2021-04-08 14:21 ` Sergey Organov
2021-04-08 17:27 ` Junio C Hamano
2021-04-08 17:38 ` Sergey Organov
2021-04-07 22:56 ` [PATCH 2/9] diff-merges: refactor set_diff_merges() Sergey Organov
2021-04-07 22:56 ` [PATCH 3/9] diff-merges: introduce log.diffMerges config variable Sergey Organov
2021-04-08 21:37 ` SZEDER Gábor
2021-04-08 21:51 ` SZEDER Gábor
2021-04-08 22:01 ` Junio C Hamano
2021-04-08 23:04 ` Sergey Organov
2021-04-07 22:56 ` [PATCH 4/9] diff-merges: adapt -m to enable default diff format Sergey Organov
2021-04-07 22:56 ` [PATCH 5/9] t4013: add test for --diff-merges=def Sergey Organov
2021-04-07 22:56 ` [PATCH 6/9] t4013: add tests for log.diffMerges config Sergey Organov
2021-04-07 23:06 ` Ævar Arnfjörð Bjarmason
2021-04-07 23:35 ` Junio C Hamano
2021-04-08 14:25 ` Sergey Organov
2021-04-07 22:56 ` [PATCH 7/9] t9902: fix completion tests for log.d* to match log.diffMerges Sergey Organov
2021-04-07 23:05 ` Ævar Arnfjörð Bjarmason
2021-04-08 14:41 ` Sergey Organov
2021-04-08 19:50 ` Ævar Arnfjörð Bjarmason
2021-04-08 20:26 ` Sergey Organov
2021-04-08 22:13 ` SZEDER Gábor
2021-04-08 23:07 ` Sergey Organov
2021-04-07 22:56 ` [PATCH 8/9] doc/diff-options: document new --diff-merges features Sergey Organov
2021-04-07 22:56 ` [PATCH 9/9] doc/config: document log.diffMerges Sergey Organov
2021-04-10 17:16 ` [PATCH v1 0/5] git log: configurable default format for merge diffs Sergey Organov
2021-04-10 17:16 ` [PATCH v1 1/5] diff-merges: introduce --diff-merges=default Sergey Organov
2021-04-10 17:16 ` [PATCH v1 2/5] diff-merges: refactor set_diff_merges() Sergey Organov
2021-04-10 17:16 ` [PATCH v1 3/5] diff-merges: adapt -m to enable default diff format Sergey Organov
2021-04-10 17:16 ` [PATCH v1 4/5] diff-merges: introduce log.diffMerges config variable Sergey Organov
2021-04-10 17:16 ` [PATCH v1 5/5] doc/diff-options: document new --diff-merges features Sergey Organov
2021-04-11 16:13 ` [PATCH v1 0/5] git log: configurable default format for merge diffs Junio C Hamano
2021-04-11 18:04 ` Sergey Organov
2021-04-11 19:02 ` Junio C Hamano
2021-04-11 20:38 ` Sergey Organov
2021-04-11 21:58 ` Sergey Organov
2021-04-13 11:41 ` [PATCH v2 " Sergey Organov
2021-04-13 11:41 ` [PATCH v2 1/5] diff-merges: introduce --diff-merges=on Sergey Organov
2021-04-13 23:18 ` Junio C Hamano
2021-04-13 11:41 ` [PATCH v2 2/5] diff-merges: refactor set_diff_merges() Sergey Organov
2021-04-13 11:41 ` [PATCH v2 3/5] diff-merges: adapt -m to enable default diff format Sergey Organov
2021-04-13 11:41 ` [PATCH v2 4/5] diff-merges: introduce log.diffMerges config variable Sergey Organov
2021-04-15 20:21 ` Junio C Hamano
2021-04-16 8:30 ` Sergey Organov
2021-04-13 11:41 ` [PATCH v2 5/5] doc/diff-options: document new --diff-merges features Sergey Organov
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=f6b25ea6-88b1-c167-7fd4-440be8782fcb@iee.email \
--to=philipoakley@iee.email \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=sorganov@gmail.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).