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

Re: [PATCH v3 4/4] log: speed up --follow following renames for non-linear history

From
Patrick Steinhardt <ps@pks.im>
Date
Oct 26, 2026, 11:40 UTC
Message-ID
<at88ORA5midZJctp@pks.im>
In-Reply-To
<6f249099cf214f83d31bc04980bc2e9dfd861bba.1792701579.git.vmiklos@collabora.com>
On Thu, Oct 22, 2026 at 10:47:06PM +0200, Miklos Vajna wrote:
Show 23 quoted lines
> diff --git a/log-tree.c b/log-tree.c
> index c5ac6c2bcb..d5ce58d91d 100644
> --- a/log-tree.c
> +++ b/log-tree.c
> @@ -1153,6 +1169,29 @@ void release_follow_pathspec_slab(struct rev_info *opt)
>  	FREE_AND_NULL(opt->follow_pathspec_slab);
>  }
>  
> +/*
> + * When the path in a merge is the same as in 'same', does the path still need
> + * renames to be followed in 'parent'? Only if the merge has the path, 'parent'
> + * doesn't have it, but its fork point with 'same' had it, e.g. 'parent'
> + * renamed the path.
> + */
> +static int follow_needs_renames(struct rev_info *opt, struct commit *parent,
> +				struct commit *same, const char *path)
> +{
> +	struct commit_list *bases = NULL, *base;
> +	int ret = 0;
> +
> +	if (commit_has_path(opt, parent, path) ||
> +	    !commit_has_path(opt, same, path))
> +		return 0;

Doesn't this miss the reverse case where we have the path in "parent", but not in "same"? So basically this test case, which is very similar to the one you already added to 4219:

test_expect_success 'setup merge keeping the renamed path, other side edited the old one' '
	git init keep-renamed &&
	printf "line 1\nline 2\nline 3\nline 4\nline 5\n" >keep-renamed/F &&
	git -C keep-renamed add F &&
	test_tick &&
	git -C keep-renamed commit -m "O: add F" &&
	git -C keep-renamed branch B &&
	git -C keep-renamed mv F G &&
	test_tick &&
	git -C keep-renamed commit -m "A1: rename F to G on master" &&
	git -C keep-renamed checkout B &&
	printf "line 1\nline 2\nline 3\nline 4 T\nline 5\n" >keep-renamed/F &&
	test_tick &&
	git -C keep-renamed commit -am "B2: update F on B" &&
	git -C keep-renamed checkout master &&
	test_tick &&
	git -C keep-renamed merge -s ours -m "M: merge B, keep G, drop F" B
'
test_expect_success '--follow follows an edit on the side the merge did not take' '
	git -C keep-renamed log --follow --pretty=tformat:%s G >actual &&
	cat >expect <<-\EOF &&
	B2: update F on B
	A1: rename F to G on master
	O: add F
	EOF
	test_cmp expect actual
'
That test passes with HEAD~, but fails with HEAD.
Patrick
Previous: Miklos VajnaNext: Patrick Steinhardt
Message 12 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.