From: Phillip Wood <phillip.wood123@gmail•com>
To: Antonin Delpeuch via GitGitGadget <gitgitgadget@gmail•com>,
git@vger•kernel.org
Cc: Elijah Newren <newren@gmail•com>, Antonin Delpeuch <antonin@delpeuch•eu>
Subject: Re: [PATCH] blame: make diff algorithm configurable
Date: Thu, 23 Oct 2025 17:03:23 +0100 [thread overview]
Message-ID: <0d6019c7-5e73-4195-b5d2-b43f2cb6399d@gmail.com> (raw)
In-Reply-To: <pull.2075.git.git.1760972162827.gitgitgadget@gmail.com>
Hi Antonin
On 20/10/2025 15:56, Antonin Delpeuch via GitGitGadget wrote:
> From: Antonin Delpeuch <antonin@delpeuch•eu>
>
> The diff algorithm used in 'git-blame(1)' can be configured using the
> `--diff-algorithm` option or the `diff.algorithm` config variable.
> Myers diff remains the default.
I think this sounds like a reasonable thing to do, although it is
technically a breaking change.
> diff --git a/builtin/blame.c b/builtin/blame.c
> index 2703820258..177b606e81 100644
> --- a/builtin/blame.c
> +++ b/builtin/blame.c
> @@ -779,6 +779,19 @@ static int git_blame_config(const char *var, const char *value,
> }
> }
>
> + if (!strcmp(var, "diff.algorithm")) {
> + long diff_algorithm;
> + if (!value)
> + return config_error_nonbool(var);
> + diff_algorithm = parse_algorithm_value(value);
> + if (diff_algorithm < 0)
> + return error(_("unknown value for config '%s': %s"),
> + var, value);
> + xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
I think this should be
xdl_opts &= ~(XDF_DIFF_ALGORITHM_MASK | XDF_NEED_MINIMAL);
as you have below for the option parsing.
> + xdl_opts |= diff_algorithm;
> + return 0;
> + }
> +
> if (git_diff_heuristic_config(var, value, cb) < 0)
> return -1;
> if (userdiff_config(var, value) < 0)
> @@ -824,6 +837,26 @@ static int blame_move_callback(const struct option *option, const char *arg, int
> return 0;
> }
>
> +static int blame_diff_algorithm_callback(const struct option *option,
> + const char *arg, int unset)
> +{
> + int *opt = option->value;
> + long value = parse_algorithm_value(arg);
> +
> + BUG_ON_OPT_NEG(unset);
> +
> + if (value < 0)
> + return error(_("option diff-algorithm accepts \"myers\", "
> + "\"minimal\", \"patience\" and \"histogram\""));
> +
> + // ignore any previous --minimal setting, following git-diff's behavior
Style - oneline comments should look like
/* comment */
> + *opt &= ~XDF_NEED_MINIMAL;
> + *opt &= ~XDF_DIFF_ALGORITHM_MASK;
> + *opt |= value;
"git blame" also has a "--minimal" option which now needs to clear the
diff algorithm when it sets the minimal flag.
Thanks
Phillip
next prev parent reply other threads:[~2025-10-23 16:03 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-20 14:56 [PATCH] blame: make diff algorithm configurable Antonin Delpeuch via GitGitGadget
2025-10-20 16:05 ` Junio C Hamano
2025-10-22 9:37 ` Antonin Delpeuch
2025-10-22 20:39 ` Junio C Hamano
2025-10-23 16:03 ` Phillip Wood [this message]
2025-10-28 13:37 ` [PATCH v2] " Antonin Delpeuch via GitGitGadget
2025-10-28 15:22 ` Junio C Hamano
2025-10-28 16:00 ` Antonin Delpeuch
2025-10-28 21:14 ` [PATCH v3] " Antonin Delpeuch via GitGitGadget
2025-10-29 10:16 ` Phillip Wood
2025-10-29 18:46 ` Junio C Hamano
2025-10-30 9:22 ` Antonin Delpeuch
2025-10-30 10:47 ` Phillip Wood
2025-11-01 21:57 ` [PATCH v4 0/2] " Antonin Delpeuch via GitGitGadget
2025-11-01 21:57 ` [PATCH v4 1/2] xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASK Antonin Delpeuch via GitGitGadget
2025-11-03 14:32 ` Phillip Wood
2025-11-01 21:57 ` [PATCH v4 2/2] blame: make diff algorithm configurable Antonin Delpeuch via GitGitGadget
2025-11-03 14:32 ` Phillip Wood
2025-11-03 16:15 ` Junio C Hamano
2025-11-06 20:29 ` Junio C Hamano
2025-11-06 22:41 ` [PATCH v5 0/2] " Antonin Delpeuch via GitGitGadget
2025-11-06 22:41 ` [PATCH v5 1/2] xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASK Antonin Delpeuch via GitGitGadget
2025-11-07 15:52 ` Junio C Hamano
2025-11-06 22:41 ` [PATCH v5 2/2] blame: make diff algorithm configurable Antonin Delpeuch via GitGitGadget
2025-11-07 15:57 ` Junio C Hamano
2025-11-07 15:49 ` [PATCH v5 0/2] " Phillip Wood
2025-11-17 1:12 ` Junio C Hamano
2025-11-17 8:04 ` [PATCH v6 " Antonin Delpeuch via GitGitGadget
2025-11-17 8:04 ` [PATCH v6 1/2] xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASK Antonin Delpeuch via GitGitGadget
2025-11-17 8:04 ` [PATCH v6 2/2] blame: make diff algorithm configurable Antonin Delpeuch via GitGitGadget
2025-11-17 14:13 ` [PATCH v6 0/2] " Phillip Wood
2025-11-17 18:24 ` 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=0d6019c7-5e73-4195-b5d2-b43f2cb6399d@gmail.com \
--to=phillip.wood123@gmail$(echo .)com \
--cc=antonin@delpeuch$(echo .)eu \
--cc=git@vger$(echo .)kernel.org \
--cc=gitgitgadget@gmail$(echo .)com \
--cc=newren@gmail$(echo .)com \
--cc=phillip.wood@dunelm$(echo .)org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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