git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] log: make --follow following renames for non-linear history optional

From
Patrick Steinhardt <ps@pks.im>
Date
Nov 13, 2026, 07:00 UTC
Message-ID
<ava1ax5UFfcvkU_d@pks.im>
In-Reply-To
<avWBQ_10mHUNQcFi@collabora.com>
On Thu, Nov 12, 2026 at 09:05:07AM +0000, Miklos Vajna wrote:
Show 15 quoted lines
> diff --git a/Documentation/config/log.adoc b/Documentation/config/log.adoc
> index f7dfce69b5..72a3486a73 100644
> --- a/Documentation/config/log.adoc
> +++ b/Documentation/config/log.adoc
> @@ -53,7 +53,9 @@ This is the same as the `--decorate` option of the `git log`.
>  `log.follow`::
>  	If `true`, `git log` will act as if the `--follow` option was used when
>  	a single <path> is given.  This has the same limitations as `--follow`,
> -	i.e. it cannot be used to follow multiple files.
> +	i.e. it cannot be used to follow multiple files and does not work well
> +	on non-linear history.  If `merges`, `git log` will act as if the
> +	`--follow=merges` option was used.
>  
>  `log.graphColors`::
>  	A list of colors, separated by commas, that can be used to draw

I'd think we should also document here that "merges" is expensive, same as you do for "--follow[=merges]".

Show 16 quoted lines
> diff --git a/builtin/log.c b/builtin/log.c
> index 350b35c556..db707877f6 100644
> --- a/builtin/log.c
> +++ b/builtin/log.c
> @@ -505,7 +508,10 @@ static int git_log_config(const char *var, const char *value,
>  		return 0;
>  	}
>  	if (!strcmp(var, "log.follow")) {
> -		cfg->default_follow = git_config_bool(var, value);
> +		if (value && !strcmp(value, "merges"))
> +			cfg->default_follow = 2;
> +		else
> +			cfg->default_follow = git_config_bool(var, value);
>  		return 0;
>  	}
>  	if (skip_prefix(var, "color.decorate.", &slot_name))

I think we should use `git_parse_maybe_bool()` here, as we otherwise die with "fatal: bad boolean config value 'bogus' for 'log.follow'" in case it's not a boolean. Then we can die with our own error message.

Show 16 quoted lines
> @@ -814,9 +820,14 @@ int cmd_log_reflog(int argc,
>  
>  static void log_setup_revisions_tweak(struct rev_info *rev)
>  {
> +	/* If --follow is not used, use the log.follow option. */
>  	if (rev->diffopt.flags.default_follow_renames &&
> -	    diff_check_follow_pathspec(&rev->prune_data, 0))
> +	    !rev->diffopt.flags.follow_renames &&
> +	    diff_check_follow_pathspec(&rev->prune_data, 0)) {
>  		rev->diffopt.flags.follow_renames = 1;
> +		rev->diffopt.flags.follow_merges =
> +			rev->diffopt.flags.default_follow_merges;
> +	}
>  
>  	if (rev->first_parent_only)
>  		diff_merges_default_to_first_parent(rev);

I assume that this change here is done so that "--follow" overrides "log.follow=merge". Makes sense.

Show 24 quoted lines
> diff --git a/log-tree.c b/log-tree.c
> index 83a3c4bf9b..93cc61af2d 100644
> --- a/log-tree.c
> +++ b/log-tree.c
> @@ -1277,7 +1277,8 @@ int log_tree_commit(struct rev_info *opt, struct commit *commit)
>  	opt->diffopt.no_free = 1;
>  
>  	/* Any recorded path for this commit? If so, restore it */
> -	if (opt->diffopt.flags.follow_renames) {
> +	if (opt->diffopt.flags.follow_renames &&
> +	    opt->diffopt.flags.follow_merges) {
>  		const char *stored = recall_follow_pathspec(opt, commit);
>  		if (stored) {
>  			const char *current = pathspec_single_path(&opt->diffopt.pathspec);
> @@ -1300,7 +1301,8 @@ int log_tree_commit(struct rev_info *opt, struct commit *commit)
>  		show_diff_of_diff(opt);
>  
>  	/* Record what path each parent of this commit should use */
> -	if (opt->diffopt.flags.follow_renames) {
> +	if (opt->diffopt.flags.follow_renames &&
> +	    opt->diffopt.flags.follow_merges) {
>  		struct commit_list *parents = get_saved_parents(opt, commit);
>  		if (parents && parents->next) {
>  			struct commit_list *p;

Okay, and these two changes here disable the logic where we record the changed paths on all parents, and that should get us back to previous speed by default. Good.

As far as I've seen we only ever set `follow_merges` when `follow_renames = 1`, so it feels redundant to check for both. But on the other hand that's a bit more defensive, so maybe that's not a bad idea.

Other than those nits this patch looks good to me, thanks!
Patrick
Previous: Junio C HamanoNext: Miklos Vajna
Message 41 of 48 in “Performance regression in `git log --follow`”
  1. Patrick SteinhardtOct 13, 2026
  2. SZEDER GáborOct 13, 2026
  3. log: speed up --follow following renames for non-linear historyMiklos Vajna, Oct 15, 2026
  4. Junio C HamanoOct 15, 2026
  5. log: speed up --follow following renames for non-linear historyMiklos Vajna, Oct 19, 2026
  6. 0/4 log: speed up --follow following renames for non-linear historyMiklos Vajna, Oct 22, 2026
  7. 1/4 t4219: test more --follow cases across mergesMiklos Vajna, Oct 22, 2026
  8. 2/4 log: extract showing the remerge/combined diff of a merge commitMiklos Vajna, Oct 22, 2026
  9. 3/4 log: simplify --follow following renames for non-linear historyMiklos Vajna, Oct 22, 2026
  10. Patrick SteinhardtOct 26, 2026
  11. 4/4 log: speed up --follow following renames for non-linear historyMiklos Vajna, Oct 22, 2026
  12. Patrick SteinhardtOct 26, 2026
  13. Patrick SteinhardtOct 26, 2026
  14. 0/6 log: speed up --follow following renames for non-linear historyMiklos Vajna, Oct 30, 2026
  15. 1/6 t4219: test more --follow cases across mergesMiklos Vajna, Oct 30, 2026
  16. 2/6 log: extract showing the remerge/combined diff of a merge commitMiklos Vajna, Oct 30, 2026
  17. 3/6 log: fix -m --follow losing the history of later parentsMiklos Vajna, Oct 30, 2026
  18. 4/6 log: simplify --follow following renames for non-linear historyMiklos Vajna, Oct 30, 2026
  19. 5/6 log: speed up --follow following renames for non-linear historyMiklos Vajna, Oct 30, 2026
  20. Patrick SteinhardtNov 6, 2026
  21. Miklos VajnaNov 9, 2026
  22. 6/6 log: fix --follow following an edit on a side the merge did not takeMiklos Vajna, Oct 30, 2026
  23. Patrick SteinhardtNov 6, 2026
  24. Miklos VajnaNov 9, 2026
  25. Patrick SteinhardtNov 6, 2026
  26. Miklos VajnaNov 9, 2026
  27. 0/5 log: speed up --follow following renames for non-linear historyMiklos Vajna, Nov 9, 2026
  28. 1/5 t4219: test more --follow cases across mergesMiklos Vajna, Nov 9, 2026
  29. Justin ToblerNov 10, 2026
  30. 2/5 log: extract showing the remerge/combined diff of a merge commitMiklos Vajna, Nov 9, 2026
  31. 3/5 log: fix -m --follow losing the history of later parentsMiklos Vajna, Nov 9, 2026
  32. 4/5 log: simplify --follow following renames for non-linear historyMiklos Vajna, Nov 9, 2026
  33. Toon ClaesNov 10, 2026
  34. 5/5 log: speed up --follow following renames for non-linear historyMiklos Vajna, Nov 9, 2026
  35. Justin ToblerNov 11, 2026
  36. Patrick SteinhardtNov 11, 2026
  37. Miklos VajnaNov 11, 2026
  38. Patrick SteinhardtNov 11, 2026
  39. log: make --follow following renames for non-linear history optionalMiklos Vajna, Nov 12, 2026
  40. Junio C HamanoNov 12, 2026
  41. Patrick SteinhardtNov 13, 2026
  42. log: make --follow following renames for non-linear history optionalMiklos Vajna, Nov 16, 2026
  43. Patrick SteinhardtNov 16, 2026
  44. Junio C HamanoNov 16, 2026
  45. Miklos VajnaNov 17, 2026
  46. Junio C HamanoNov 11, 2026
  47. Junio C HamanoOct 16, 2026
  48. Miklos VajnaOct 14, 2026

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.