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 v6 0/2] blame: make diff algorithm configurable
Date: Mon, 17 Nov 2025 14:13:12 +0000 [thread overview]
Message-ID: <fd03f2a5-bf9e-453f-97d1-d5a66bc87470@gmail.com> (raw)
In-Reply-To: <pull.2075.v6.git.git.1763366672.gitgitgadget@gmail.com>
Hi Antonin
On 17/11/2025 08:04, Antonin Delpeuch via GitGitGadget wrote:
> Changes since v5:
>
> * add back /* clear out previous settings */ comments
> * remove whitespace in bash output redirection
Thanks for re-rolling, the range-diff below looks good. Being able to
configure the diff algorithm for "git blame" is a nice addition, thanks
for working on it.
Phillip
> Antonin Delpeuch (2):
> xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASK
> blame: make diff algorithm configurable
>
> Documentation/diff-algorithm-option.adoc | 20 +++
> Documentation/diff-options.adoc | 21 +--
> Documentation/git-blame.adoc | 2 +
> builtin/blame.c | 52 +++++-
> diff.c | 1 -
> merge-ort.c | 1 -
> t/meson.build | 1 +
> t/t8015-blame-diff-algorithm.sh | 203 +++++++++++++++++++++++
> xdiff/xdiff.h | 2 +-
> 9 files changed, 279 insertions(+), 24 deletions(-)
> create mode 100644 Documentation/diff-algorithm-option.adoc
> create mode 100755 t/t8015-blame-diff-algorithm.sh
>
>
> base-commit: 4253630c6f07a4bdcc9aa62a50e26a4d466219d1
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2075%2Fwetneb%2Fblame_respects_diff_algorithm-v6
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2075/wetneb/blame_respects_diff_algorithm-v6
> Pull-Request: https://github.com/git/git/pull/2075
>
> Range-diff vs v5:
>
> 1: e81a5d2bd2 ! 1: 4846715436 xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASK
> @@ Commit message
>
> ## diff.c ##
> @@ diff.c: static int set_diff_algorithm(struct diff_options *opts,
> - if (value < 0)
> return -1;
>
> -- /* clear out previous settings */
> + /* clear out previous settings */
> - DIFF_XDL_CLR(opts, NEED_MINIMAL);
> opts->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
> opts->xdl_opts |= value;
> @@ diff.c: static int set_diff_algorithm(struct diff_options *opts,
>
> ## merge-ort.c ##
> @@ merge-ort.c: int parse_merge_opt(struct merge_options *opt, const char *s)
> - long value = parse_algorithm_value(arg);
> if (value < 0)
> return -1;
> -- /* clear out previous settings */
> + /* clear out previous settings */
> - DIFF_XDL_CLR(opt, NEED_MINIMAL);
> opt->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
> opt->xdl_opts |= value;
> 2: 60015bbada ! 2: c477b87cc6 blame: make diff algorithm configurable
> @@ t/t8015-blame-diff-algorithm.sh (new)
> + Commit_1 }
> + EOF
> +
> -+ git blame file.c > output &&
> -+ sed -e "s/^[^ ]* (\([^ ]*\) [^)]*)/\1/g" output > without_varying_parts &&
> -+ sed -e "s/ *$//g" without_varying_parts > actual &&
> ++ git blame file.c >output &&
> ++ sed -e "s/^[^ ]* (\([^ ]*\) [^)]*)/\1/g" output >without_varying_parts &&
> ++ sed -e "s/ *$//g" without_varying_parts >actual &&
> + test_cmp expected actual
> +'
> +
> @@ t/t8015-blame-diff-algorithm.sh (new)
> + Commit_2 }
> + EOF
> +
> -+ git blame file.c --diff-algorithm histogram > output &&
> -+ sed -e "s/^[^ ]* (\([^ ]*\) [^)]*)/\1/g" output > without_varying_parts &&
> -+ sed -e "s/ *$//g" without_varying_parts > actual &&
> ++ git blame file.c --diff-algorithm histogram >output &&
> ++ sed -e "s/^[^ ]* (\([^ ]*\) [^)]*)/\1/g" output >without_varying_parts &&
> ++ sed -e "s/ *$//g" without_varying_parts >actual &&
> + test_cmp expected actual
> +'
> +
> @@ t/t8015-blame-diff-algorithm.sh (new)
> + Commit_2 }
> + EOF
> +
> -+ git -c diff.algorithm=histogram blame file.c > output &&
> ++ git -c diff.algorithm=histogram blame file.c >output &&
> + sed -e "s/^[^ ]* (\([^ ]*\) [^)]*)/\1/g" \
> -+ -e "s/ *$//g" output > actual &&
> ++ -e "s/ *$//g" output >actual &&
> + test_cmp expected actual
> +'
> +
> @@ t/t8015-blame-diff-algorithm.sh (new)
> + Commit_2 }
> + EOF
> +
> -+ git -c diff.algorithm=myers blame file.c --diff-algorithm histogram > output &&
> ++ git -c diff.algorithm=myers blame file.c --diff-algorithm histogram >output &&
> + sed -e "s/^[^ ]* (\([^ ]*\) [^)]*)/\1/g" \
> -+ -e "s/ *$//g" output > actual &&
> ++ -e "s/ *$//g" output >actual &&
> + test_cmp expected actual
> +'
> +
> @@ t/t8015-blame-diff-algorithm.sh (new)
> + Commit_2 G
> + EOF
> +
> -+ git blame file.txt --minimal > output &&
> -+ sed -e "s/^[^ ]* (\([^ ]*\) [^)]*)/\1/g" output > actual &&
> ++ git blame file.txt --minimal >output &&
> ++ sed -e "s/^[^ ]* (\([^ ]*\) [^)]*)/\1/g" output >actual &&
> + test_cmp expected actual
> +'
> +
> @@ t/t8015-blame-diff-algorithm.sh (new)
> + Commit_2 G
> + EOF
> +
> -+ git blame file.txt --minimal --diff-algorithm myers > output &&
> -+ sed -e "s/^[^ ]* (\([^ ]*\) [^)]*)/\1/g" output > actual &&
> ++ git blame file.txt --minimal --diff-algorithm myers >output &&
> ++ sed -e "s/^[^ ]* (\([^ ]*\) [^)]*)/\1/g" output >actual &&
> + test_cmp expected actual
> +'
> +
>
next prev parent reply other threads:[~2025-11-17 14:13 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
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 ` Phillip Wood [this message]
2025-11-17 18:24 ` [PATCH v6 0/2] " 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=fd03f2a5-bf9e-453f-97d1-d5a66bc87470@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