From: Patrick Steinhardt <ps@pks.im>
To: Miklos Vajna <vmiklos@collabora.com>
Cc: gitster@pobox.com, szeder.dev@gmail.com, git@vger.kernel.org
Subject: Re: [PATCH v4 0/6] log: speed up --follow following renames for non-linear history
Date: Fri, 6 Nov 2026 15:14:03 +0100 [thread overview]
Message-ID: <au3gn7kUFYZWUinE@pks.im> (raw)
In-Reply-To: <cover.1793298331.git.vmiklos@collabora.com>
Hi Miklos,
On Fri, Oct 30, 2026 at 09:07:00PM +0100, Miklos Vajna wrote:
> Hi Patrick,
>
> Thanks for the reviews of v3. Changes in v4:
please note that the expectation is that you answer to the review
comments directly instead of only answering reviews via the cover letter
of the next version. We want there to be discussions, and reviewers
should not have to figure out by themselves whether you did or did not
address specific concerns.
> - Patch 6/6 fixes the case you found, where the speedup lost history:
> one side of the merge renamed the path, and the other side, whose
> version the merge dropped, edited the old name. It uses your test.
> I kept it separate from the speedup patch, which is complicated
> enough already. With the extra check, the linux.git case still takes
> about 37s.
Hmm, okay. But isn't it the case that your speedup patch introduces a
regression where we now don't follow history in some specific cases
anymore, and that regression was only introduced in the preceding
commit? So it's a bit curious to have this be an extra commit.
> - I also noticed that the simplify patch lost history with
> --diff-merges=first-parent, which diffs merges only against their
> first parent, but still walks all parents. Fixed that and added a
> test for it to 1/6.
> Interdiff against v3:
Instead of an interdiff, could you please send a range-diff next time?
That makes it was easier to see which specific commits I need to have a
look at again, and it also shows diffs to commit messages.
Patrick
next prev parent reply other threads:[~2026-11-06 14:14 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-13 13:55 Performance regression in `git log --follow` Patrick Steinhardt
2026-10-13 21:24 ` SZEDER Gábor
2026-10-15 14:48 ` [PATCH] log: speed up --follow following renames for non-linear history Miklos Vajna
2026-10-15 16:57 ` Junio C Hamano
2026-10-19 6:10 ` [PATCH v2] " Miklos Vajna
2026-10-22 20:45 ` [PATCH v3 0/4] " Miklos Vajna
2026-10-22 20:45 ` [PATCH v3 1/4] t4219: test more --follow cases across merges Miklos Vajna
2026-10-22 20:46 ` [PATCH v3 2/4] log: extract showing the remerge/combined diff of a merge commit Miklos Vajna
2026-10-22 20:46 ` [PATCH v3 3/4] log: simplify --follow following renames for non-linear history Miklos Vajna
2026-10-26 11:40 ` Patrick Steinhardt
2026-10-22 20:47 ` [PATCH v3 4/4] log: speed up " Miklos Vajna
2026-10-26 11:40 ` Patrick Steinhardt
2026-10-26 11:42 ` [PATCH v3 0/4] " Patrick Steinhardt
2026-10-30 20:07 ` [PATCH v4 0/6] " Miklos Vajna
2026-10-30 20:07 ` [PATCH v4 1/6] t4219: test more --follow cases across merges Miklos Vajna
2026-10-30 20:07 ` [PATCH v4 2/6] log: extract showing the remerge/combined diff of a merge commit Miklos Vajna
2026-10-30 20:08 ` [PATCH v4 3/6] log: fix -m --follow losing the history of later parents Miklos Vajna
2026-10-30 20:08 ` [PATCH v4 4/6] log: simplify --follow following renames for non-linear history Miklos Vajna
2026-10-30 20:09 ` [PATCH v4 5/6] log: speed up " Miklos Vajna
2026-11-06 14:14 ` Patrick Steinhardt
2026-10-30 20:10 ` [PATCH v4 6/6] log: fix --follow following an edit on a side the merge did not take Miklos Vajna
2026-11-06 14:14 ` Patrick Steinhardt
2026-11-06 14:14 ` Patrick Steinhardt [this message]
2026-10-16 20:37 ` [PATCH] log: speed up --follow following renames for non-linear history Junio C Hamano
2026-10-14 6:16 ` Performance regression in `git log --follow` Miklos Vajna
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=au3gn7kUFYZWUinE@pks.im \
--to=ps@pks.im \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=szeder.dev@gmail.com \
--cc=vmiklos@collabora.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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