git/list[1] front-page[2] threads[3] people[4] search[5] about
wed 2026-10-07 16:49 UTC

[PATCH v2] blame: make diff algorithm configurable

From
Antonin Delpeuch via GitGitGadget <gitgitgadget@gmail.com>
Date
Oct 28, 2025, 13:37 UTC
Message-ID
<pull.2075.v2.git.git.1761658643278.gitgitgadget@gmail.com>
In-Reply-To
<pull.2075.git.git.1760972162827.gitgitgadget@gmail.com>
From: Antonin Delpeuch <antonin@delpeuch.eu>

The diff algorithm used in 'git-blame(1)' is set to 'myers', without the possibility to change it aside from the `--minimal` option.

There has been long-standing interest in changing the default diff algorithm to "histogram", and Git 3.0 was floated as a possible occasion for taking some steps towards that:

https://lore.kernel.org/git/xmqqed873vgn.fsf@gitster.g/

As a preparation for this move, it is worth making sure that the diff algorithm is configurable where useful.

Make it configurable in the `git-blame(1)` command by introducing the `--diff-algorithm` option and make honor the `diff.algorithm` config variable. Keep Myers diff as the default.

Signed-off-by: Antonin Delpeuch <antonin@delpeuch.eu>
---
    blame: make diff algorithm configurable
    
    Changes since v1:
    
     * add tests
     * ignore --diff-algorithm when it is provided before --minimal
     * improve patch description
     * remove duplication of documentation sections
     * style improvements
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2075%2Fwetneb%2Fblame_respects_diff_algorithm-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2075/wetneb/blame_respects_diff_algorithm-v2
Pull-Request: https://github.com/git/git/pull/2075
Range-diff vs v1:
 1:  32b59d0204 ! 1:  107f51620b blame: make diff algorithm configurable
     @@ Metadata
       ## Commit message ##
          blame: make diff algorithm configurable
      
     -    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.
     +    The diff algorithm used in 'git-blame(1)' is set to 'myers',
     +    without the possibility to change it aside from the `--minimal` option.
     +
     +    There has been long-standing interest in changing the default diff
     +    algorithm to "histogram", and Git 3.0 was floated as a possible occasion
     +    for taking some steps towards that:
     +
     +    https://lore.kernel.org/git/xmqqed873vgn.fsf@gitster.g/
     +
     +    As a preparation for this move, it is worth making sure that the diff
     +    algorithm is configurable where useful.
     +
     +    Make it configurable in the `git-blame(1)` command by introducing the
     +    `--diff-algorithm` option and make honor the `diff.algorithm` config
     +    variable. Keep Myers diff as the default.
      
          Signed-off-by: Antonin Delpeuch <antonin@delpeuch.eu>
      
     - ## Documentation/git-blame.adoc ##
     -@@ Documentation/git-blame.adoc: include::blame-options.adoc[]
     - 	Ignore whitespace when comparing the parent's version and
     - 	the child's to find where the lines came from.
     - 
     + ## Documentation/diff-algorithm-option.adoc (new) ##
     +@@
      +`--diff-algorithm=(patience|minimal|histogram|myers)`::
      +	Choose a diff algorithm. The variants are as follows:
      ++
     @@ Documentation/git-blame.adoc: include::blame-options.adoc[]
      +For instance, if you configured the `diff.algorithm` variable to a
      +non-default value and want to use the default one, then you
      +have to use `--diff-algorithm=default` option.
     +
     + ## Documentation/diff-options.adoc ##
     +@@ Documentation/diff-options.adoc: and starts with _<text>_, this algorithm attempts to prevent it from
     + appearing as a deletion or addition in the output. It uses the "patience
     + diff" algorithm internally.
     + 
     +-`--diff-algorithm=(patience|minimal|histogram|myers)`::
     +-	Choose a diff algorithm. The variants are as follows:
     +-+
     +---
     +-   `default`;;
     +-   `myers`;;
     +-	The basic greedy diff algorithm. Currently, this is the default.
     +-   `minimal`;;
     +-	Spend extra time to make sure the smallest possible diff is
     +-	produced.
     +-   `patience`;;
     +-	Use "patience diff" algorithm when generating patches.
     +-   `histogram`;;
     +-	This algorithm extends the patience algorithm to "support
     +-	low-occurrence common elements".
     +---
     +-+
     +-For instance, if you configured the `diff.algorithm` variable to a
     +-non-default value and want to use the default one, then you
     +-have to use `--diff-algorithm=default` option.
     ++include::diff-algorithm-option.adoc[]
     + 
     + `--stat[=<width>[,<name-width>[,<count>]]]`::
     + 	Generate a diffstat. By default, as much space as necessary
     +
     + ## Documentation/git-blame.adoc ##
     +@@ Documentation/git-blame.adoc: include::blame-options.adoc[]
     + 	Ignore whitespace when comparing the parent's version and
     + 	the child's to find where the lines came from.
     + 
     ++include::diff-algorithm-option.adoc[]
      +
       --abbrev=<n>::
       	Instead of using the default 7+1 hexadecimal digits as the
     @@ builtin/blame.c: static int blame_move_callback(const struct option *option, con
       	return 0;
       }
       
     ++static int blame_diff_algorithm_minimal(const struct option *option,
     ++					const char *arg, int unset)
     ++{
     ++	int *opt = option->value;
     ++
     ++	BUG_ON_OPT_NEG(unset);
     ++	BUG_ON_OPT_ARG(arg);
     ++
     ++	*opt &= ~XDF_DIFF_ALGORITHM_MASK;
     ++	*opt |= XDF_NEED_MINIMAL;
     ++
     ++	return 0;
     ++}
     ++
      +static int blame_diff_algorithm_callback(const struct option *option,
      +					 const char *arg, int unset)
      +{
     @@ builtin/blame.c: static int blame_move_callback(const struct option *option, con
      +		return error(_("option diff-algorithm accepts \"myers\", "
      +			       "\"minimal\", \"patience\" and \"histogram\""));
      +
     -+	// ignore any previous --minimal setting, following git-diff's behavior
     -+	*opt &= ~XDF_NEED_MINIMAL;
     -+	*opt &= ~XDF_DIFF_ALGORITHM_MASK;
     ++	*opt &= ~(XDF_NEED_MINIMAL | XDF_DIFF_ALGORITHM_MASK);
      +	*opt |= value;
      +
      +	return 0;
     @@ builtin/blame.c: static int blame_move_callback(const struct option *option, con
       {
       	struct object_id oid;
      @@ builtin/blame.c: int cmd_blame(int argc,
     - 		OPT_BIT('f', "show-name", &output_option, N_("show original filename (Default: auto)"), OUTPUT_SHOW_NAME),
     - 		OPT_BIT('n', "show-number", &output_option, N_("show original linenumber (Default: off)"), OUTPUT_SHOW_NUMBER),
     - 		OPT_BIT('p', "porcelain", &output_option, N_("show in a format designed for machine consumption"), OUTPUT_PORCELAIN),
     --		OPT_BIT(0, "line-porcelain", &output_option, N_("show porcelain format with per-line commit information"), OUTPUT_PORCELAIN|OUTPUT_LINE_PORCELAIN),
     -+		OPT_BIT(0, "line-porcelain", &output_option, N_("show porcelain format with per-line commit information"), OUTPUT_PORCELAIN | OUTPUT_LINE_PORCELAIN),
     - 		OPT_BIT('c', NULL, &output_option, N_("use the same output mode as git-annotate (Default: off)"), OUTPUT_ANNOTATE_COMPAT),
     - 		OPT_BIT('t', NULL, &output_option, N_("show raw timestamp (Default: off)"), OUTPUT_RAW_TIMESTAMP),
     - 		OPT_BIT('l', NULL, &output_option, N_("show long commit SHA1 (Default: off)"), OUTPUT_LONG_OBJECT_NAME),
       		OPT_BIT('s', NULL, &output_option, N_("suppress author name and timestamp (Default: off)"), OUTPUT_NO_AUTHOR),
       		OPT_BIT('e', "show-email", &output_option, N_("show author email instead of name (Default: off)"), OUTPUT_SHOW_EMAIL),
       		OPT_BIT('w', NULL, &xdl_opts, N_("ignore whitespace differences"), XDF_IGNORE_WHITESPACE),
     @@ builtin/blame.c: int cmd_blame(int argc,
       		OPT_STRING_LIST(0, "ignore-rev", &ignore_rev_list, N_("rev"), N_("ignore <rev> when blaming")),
       		OPT_STRING_LIST(0, "ignore-revs-file", &ignore_revs_file_list, N_("file"), N_("ignore revisions from <file>")),
       		OPT_BIT(0, "color-lines", &output_option, N_("color redundant metadata from previous line differently"), OUTPUT_COLOR_LINE),
     + 		OPT_BIT(0, "color-by-age", &output_option, N_("color lines by age"), OUTPUT_SHOW_AGE_WITH_COLOR),
     ++		OPT_CALLBACK_F(0, "minimal", &xdl_opts, NULL,
     ++			       N_("spend extra cycles to find better match"),
     ++			       PARSE_OPT_NONEG | PARSE_OPT_NOARG,
     ++			       blame_diff_algorithm_minimal),
     + 		OPT_BIT(0, "minimal", &xdl_opts, N_("spend extra cycles to find better match"), XDF_NEED_MINIMAL),
     + 		OPT_STRING('S', NULL, &revs_file, N_("file"), N_("use revisions from <file> instead of calling git-rev-list")),
     + 		OPT_STRING(0, "contents", &contents_from, N_("file"), N_("use <file>'s contents as the final image")),
     +
     + ## t/meson.build ##
     +@@ t/meson.build: integration_tests = [
     +   't8012-blame-colors.sh',
     +   't8013-blame-ignore-revs.sh',
     +   't8014-blame-ignore-fuzzy.sh',
     ++  't8015-blame-diff-algorithm.sh',
     +   't8020-last-modified.sh',
     +   't9001-send-email.sh',
     +   't9002-column.sh',
     +
     + ## t/t8015-blame-diff-algorithm.sh (new) ##
     +@@
     ++#!/bin/sh
     ++
     ++test_description='git blame with specific diff algorithm'
     ++
     ++. ./test-lib.sh
     ++
     ++test_expect_success setup '
     ++	cat >file.c <<-\EOF &&
     ++	int f(int x, int y)
     ++	{
     ++		if (x == 0)
     ++		{
     ++			return y;
     ++		}
     ++		return x;
     ++	}
     ++
     ++	int g(size_t u)
     ++	{
     ++		while (u < 30)
     ++		{
     ++			u++;
     ++		}
     ++		return u;
     ++	}
     ++	EOF
     ++	test_write_lines x x x x >file.txt &&
     ++	git add file.c file.txt &&
     ++	GIT_AUTHOR_NAME=Initial git commit -m Initial &&
     ++
     ++	cat >file.c <<-\EOF &&
     ++	int g(size_t u)
     ++	{
     ++		while (u < 30)
     ++		{
     ++			u++;
     ++		}
     ++		return u;
     ++	}
     ++
     ++	int h(int x, int y, int z)
     ++	{
     ++		if (z == 0)
     ++		{
     ++			return x;
     ++		}
     ++		return y;
     ++	}
     ++	EOF
     ++	test_write_lines x x x A B C D x E F G >file.txt &&
     ++	git add file.c file.txt &&
     ++	GIT_AUTHOR_NAME=Second git commit -m Second
     ++'
     ++
     ++test_expect_success 'blame uses Myers diff algorithm by default for now' '
     ++	cat >expected <<-\EOF &&
     ++	Second
     ++	Initial
     ++	Second
     ++	Initial
     ++	Second
     ++	Initial
     ++	Second
     ++	Initial
     ++	Initial
     ++	Second
     ++	Initial
     ++	Second
     ++	Initial
     ++	Second
     ++	Initial
     ++	Second
     ++	Initial
     ++	EOF
     ++
     ++	# git blame file.c | grep --only-matching -e Initial -e Second > actual &&
     ++	# test_cmp expected actual
     ++	echo goo
     ++'
     ++
     ++test_expect_success 'blame honors --diff-algorithm option' '
     ++	cat >expected <<-\EOF &&
     ++	Initial
     ++	Initial
     ++	Initial
     ++	Initial
     ++	Initial
     ++	Initial
     ++	Initial
     ++	Initial
     ++	Second
     ++	Second
     ++	Second
     ++	Second
     ++	Second
     ++	Second
     ++	Second
     ++	Second
     ++	Second
     ++	EOF
     ++
     ++	git blame file.c --diff-algorithm=histogram | \
     ++		grep --only-matching -e Initial -e Second > actual &&
     ++	test_cmp expected actual
     ++'
     ++
     ++test_expect_success 'blame honors diff.algorithm config variable' '
     ++	cat >expected <<-\EOF &&
     ++	Initial
     ++	Initial
     ++	Initial
     ++	Initial
     ++	Initial
     ++	Initial
     ++	Initial
     ++	Initial
     ++	Second
     ++	Second
     ++	Second
     ++	Second
     ++	Second
     ++	Second
     ++	Second
     ++	Second
     ++	Second
     ++	EOF
     ++
     ++	git config diff.algorithm histogram &&
     ++	git blame file.c | \
     ++		grep --only-matching -e Initial -e Second > actual &&
     ++	test_cmp expected actual
     ++'
     ++
     ++test_expect_success 'blame honors --minimal option' '
     ++	cat >expected <<-\EOF &&
     ++	Initial
     ++	Initial
     ++	Initial
     ++	Second
     ++	Second
     ++	Second
     ++	Second
     ++	Initial
     ++	Second
     ++	Second
     ++	Second
     ++	EOF
     ++
     ++	git blame file.txt --minimal | \
     ++		grep --only-matching -e Initial -e Second > actual &&
     ++	test_cmp expected actual
     ++'
     ++
     ++test_done
 Documentation/diff-algorithm-option.adoc |  20 +++
 Documentation/diff-options.adoc          |  21 +---
 Documentation/git-blame.adoc             |   2 +
 builtin/blame.c                          |  52 ++++++++
 t/meson.build                            |   1 +
 t/t8015-blame-diff-algorithm.sh          | 154 +++++++++++++++++++++++
 6 files changed, 230 insertions(+), 20 deletions(-)
 create mode 100644 Documentation/diff-algorithm-option.adoc
 create mode 100755 t/t8015-blame-diff-algorithm.sh
diff --git a/Documentation/diff-algorithm-option.adoc b/Documentation/diff-algorithm-option.adoc
new file mode 100644
index 0000000000..8e3a0b63d7
--- /dev/null
+++ b/Documentation/diff-algorithm-option.adoc
@@ -0,0 +1,20 @@
+`--diff-algorithm=(patience|minimal|histogram|myers)`::
+	Choose a diff algorithm. The variants are as follows:
++
+--
+   `default`;;
+   `myers`;;
+	The basic greedy diff algorithm. Currently, this is the default.
+   `minimal`;;
+	Spend extra time to make sure the smallest possible diff is
+	produced.
+   `patience`;;
+	Use "patience diff" algorithm when generating patches.
+   `histogram`;;
+	This algorithm extends the patience algorithm to "support
+	low-occurrence common elements".
+--
++
+For instance, if you configured the `diff.algorithm` variable to a
+non-default value and want to use the default one, then you
+have to use `--diff-algorithm=default` option.
diff --git a/Documentation/diff-options.adoc b/Documentation/diff-options.adoc
index ae31520f7f..9cdad6f72a 100644
--- a/Documentation/diff-options.adoc
+++ b/Documentation/diff-options.adoc
@@ -197,26 +197,7 @@ and starts with _<text>_, this algorithm attempts to prevent it from
 appearing as a deletion or addition in the output. It uses the "patience
 diff" algorithm internally.
 
-`--diff-algorithm=(patience|minimal|histogram|myers)`::
-	Choose a diff algorithm. The variants are as follows:
-+
---
-   `default`;;
-   `myers`;;
-	The basic greedy diff algorithm. Currently, this is the default.
-   `minimal`;;
-	Spend extra time to make sure the smallest possible diff is
-	produced.
-   `patience`;;
-	Use "patience diff" algorithm when generating patches.
-   `histogram`;;
-	This algorithm extends the patience algorithm to "support
-	low-occurrence common elements".
---
-+
-For instance, if you configured the `diff.algorithm` variable to a
-non-default value and want to use the default one, then you
-have to use `--diff-algorithm=default` option.
+include::diff-algorithm-option.adoc[]
 
 `--stat[=<width>[,<name-width>[,<count>]]]`::
 	Generate a diffstat. By default, as much space as necessary
diff --git a/Documentation/git-blame.adoc b/Documentation/git-blame.adoc
index e438d28625..adcbb6f5dc 100644
--- a/Documentation/git-blame.adoc
+++ b/Documentation/git-blame.adoc
@@ -85,6 +85,8 @@ include::blame-options.adoc[]
 	Ignore whitespace when comparing the parent's version and
 	the child's to find where the lines came from.
 
+include::diff-algorithm-option.adoc[]
+
 --abbrev=<n>::
 	Instead of using the default 7+1 hexadecimal digits as the
 	abbreviated object name, use <m>+1 digits, where <m> is at
diff --git a/builtin/blame.c b/builtin/blame.c
index 2703820258..eb0ab71dba 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;
+		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,38 @@ static int blame_move_callback(const struct option *option, const char *arg, int
 	return 0;
 }
 
+static int blame_diff_algorithm_minimal(const struct option *option,
+					const char *arg, int unset)
+{
+	int *opt = option->value;
+
+	BUG_ON_OPT_NEG(unset);
+	BUG_ON_OPT_ARG(arg);
+
+	*opt &= ~XDF_DIFF_ALGORITHM_MASK;
+	*opt |= XDF_NEED_MINIMAL;
+
+	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\""));
+
+	*opt &= ~(XDF_NEED_MINIMAL | XDF_DIFF_ALGORITHM_MASK);
+	*opt |= value;
+
+	return 0;
+}
+
 static int is_a_rev(const char *name)
 {
 	struct object_id oid;
@@ -915,10 +960,17 @@ int cmd_blame(int argc,
 		OPT_BIT('s', NULL, &output_option, N_("suppress author name and timestamp (Default: off)"), OUTPUT_NO_AUTHOR),
 		OPT_BIT('e', "show-email", &output_option, N_("show author email instead of name (Default: off)"), OUTPUT_SHOW_EMAIL),
 		OPT_BIT('w', NULL, &xdl_opts, N_("ignore whitespace differences"), XDF_IGNORE_WHITESPACE),
+		OPT_CALLBACK_F(0, "diff-algorithm", &xdl_opts, N_("<algorithm>"),
+			       N_("choose a diff algorithm"),
+			       PARSE_OPT_NONEG, blame_diff_algorithm_callback),
 		OPT_STRING_LIST(0, "ignore-rev", &ignore_rev_list, N_("rev"), N_("ignore <rev> when blaming")),
 		OPT_STRING_LIST(0, "ignore-revs-file", &ignore_revs_file_list, N_("file"), N_("ignore revisions from <file>")),
 		OPT_BIT(0, "color-lines", &output_option, N_("color redundant metadata from previous line differently"), OUTPUT_COLOR_LINE),
 		OPT_BIT(0, "color-by-age", &output_option, N_("color lines by age"), OUTPUT_SHOW_AGE_WITH_COLOR),
+		OPT_CALLBACK_F(0, "minimal", &xdl_opts, NULL,
+			       N_("spend extra cycles to find better match"),
+			       PARSE_OPT_NONEG | PARSE_OPT_NOARG,
+			       blame_diff_algorithm_minimal),
 		OPT_BIT(0, "minimal", &xdl_opts, N_("spend extra cycles to find better match"), XDF_NEED_MINIMAL),
 		OPT_STRING('S', NULL, &revs_file, N_("file"), N_("use revisions from <file> instead of calling git-rev-list")),
 		OPT_STRING(0, "contents", &contents_from, N_("file"), N_("use <file>'s contents as the final image")),
diff --git a/t/meson.build b/t/meson.build
index 401b24e50e..9f2fe7af8b 100644
--- a/t/meson.build
+++ b/t/meson.build
@@ -955,6 +955,7 @@ integration_tests = [
   't8012-blame-colors.sh',
   't8013-blame-ignore-revs.sh',
   't8014-blame-ignore-fuzzy.sh',
+  't8015-blame-diff-algorithm.sh',
   't8020-last-modified.sh',
   't9001-send-email.sh',
   't9002-column.sh',
diff --git a/t/t8015-blame-diff-algorithm.sh b/t/t8015-blame-diff-algorithm.sh
new file mode 100755
index 0000000000..43996df177
--- /dev/null
+++ b/t/t8015-blame-diff-algorithm.sh
@@ -0,0 +1,154 @@
+#!/bin/sh
+
+test_description='git blame with specific diff algorithm'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+	cat >file.c <<-\EOF &&
+	int f(int x, int y)
+	{
+		if (x == 0)
+		{
+			return y;
+		}
+		return x;
+	}
+
+	int g(size_t u)
+	{
+		while (u < 30)
+		{
+			u++;
+		}
+		return u;
+	}
+	EOF
+	test_write_lines x x x x >file.txt &&
+	git add file.c file.txt &&
+	GIT_AUTHOR_NAME=Initial git commit -m Initial &&
+
+	cat >file.c <<-\EOF &&
+	int g(size_t u)
+	{
+		while (u < 30)
+		{
+			u++;
+		}
+		return u;
+	}
+
+	int h(int x, int y, int z)
+	{
+		if (z == 0)
+		{
+			return x;
+		}
+		return y;
+	}
+	EOF
+	test_write_lines x x x A B C D x E F G >file.txt &&
+	git add file.c file.txt &&
+	GIT_AUTHOR_NAME=Second git commit -m Second
+'
+
+test_expect_success 'blame uses Myers diff algorithm by default for now' '
+	cat >expected <<-\EOF &&
+	Second
+	Initial
+	Second
+	Initial
+	Second
+	Initial
+	Second
+	Initial
+	Initial
+	Second
+	Initial
+	Second
+	Initial
+	Second
+	Initial
+	Second
+	Initial
+	EOF
+
+	# git blame file.c | grep --only-matching -e Initial -e Second > actual &&
+	# test_cmp expected actual
+	echo goo
+'
+
+test_expect_success 'blame honors --diff-algorithm option' '
+	cat >expected <<-\EOF &&
+	Initial
+	Initial
+	Initial
+	Initial
+	Initial
+	Initial
+	Initial
+	Initial
+	Second
+	Second
+	Second
+	Second
+	Second
+	Second
+	Second
+	Second
+	Second
+	EOF
+
+	git blame file.c --diff-algorithm=histogram | \
+		grep --only-matching -e Initial -e Second > actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'blame honors diff.algorithm config variable' '
+	cat >expected <<-\EOF &&
+	Initial
+	Initial
+	Initial
+	Initial
+	Initial
+	Initial
+	Initial
+	Initial
+	Second
+	Second
+	Second
+	Second
+	Second
+	Second
+	Second
+	Second
+	Second
+	EOF
+
+	git config diff.algorithm histogram &&
+	git blame file.c | \
+		grep --only-matching -e Initial -e Second > actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'blame honors --minimal option' '
+	cat >expected <<-\EOF &&
+	Initial
+	Initial
+	Initial
+	Second
+	Second
+	Second
+	Second
+	Initial
+	Second
+	Second
+	Second
+	EOF
+
+	git blame file.txt --minimal | \
+		grep --only-matching -e Initial -e Second > actual &&
+	test_cmp expected actual
+'
+
+test_done

base-commit: 4253630c6f07a4bdcc9aa62a50e26a4d466219d1

-- 
gitgitgadget
Previous: Phillip WoodNext: Junio C Hamano
Message 6 of 32 in “blame: make diff algorithm configurable”
  1. blame: make diff algorithm configurableAntonin Delpeuch via GitGitGadget, Oct 20, 2025
  2. Junio C HamanoOct 20, 2025
  3. Antonin DelpeuchOct 22, 2025
  4. Junio C HamanoOct 22, 2025
  5. Phillip WoodOct 23, 2025
  6. blame: make diff algorithm configurableAntonin Delpeuch via GitGitGadget, Oct 28, 2025
  7. Junio C HamanoOct 28, 2025
  8. Antonin DelpeuchOct 28, 2025
  9. blame: make diff algorithm configurableAntonin Delpeuch via GitGitGadget, Oct 28, 2025
  10. Phillip WoodOct 29, 2025
  11. Junio C HamanoOct 29, 2025
  12. Antonin DelpeuchOct 30, 2025
  13. Phillip WoodOct 30, 2025
  14. 0/2 blame: make diff algorithm configurableAntonin Delpeuch via GitGitGadget, Nov 1, 2025
  15. 1/2 xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASKAntonin Delpeuch via GitGitGadget, Nov 1, 2025
  16. 2/2 blame: make diff algorithm configurableAntonin Delpeuch via GitGitGadget, Nov 1, 2025
  17. Phillip WoodNov 3, 2025
  18. Phillip WoodNov 3, 2025
  19. Junio C HamanoNov 3, 2025
  20. Junio C HamanoNov 6, 2025
  21. 0/2 blame: make diff algorithm configurableAntonin Delpeuch via GitGitGadget, Nov 6, 2025
  22. 1/2 xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASKAntonin Delpeuch via GitGitGadget, Nov 6, 2025
  23. 2/2 blame: make diff algorithm configurableAntonin Delpeuch via GitGitGadget, Nov 6, 2025
  24. Phillip WoodNov 7, 2025
  25. Junio C HamanoNov 7, 2025
  26. Junio C HamanoNov 7, 2025
  27. Junio C HamanoNov 17, 2025
  28. 0/2 blame: make diff algorithm configurableAntonin Delpeuch via GitGitGadget, Nov 17, 2025
  29. 1/2 xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASKAntonin Delpeuch via GitGitGadget, Nov 17, 2025
  30. 2/2 blame: make diff algorithm configurableAntonin Delpeuch via GitGitGadget, Nov 17, 2025
  31. Phillip WoodNov 17, 2025
  32. Junio C HamanoNov 17, 2025

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.