All of lore.kernel.org
 help / color / mirror / Atom feed
From: Patrick Steinhardt <ps@pks.im>
To: Miklos Vajna <vmiklos@collabora.com>
Cc: gitster@pobox.com, jltobler@gmail.com, szeder.dev@gmail.com,
	git@vger.kernel.org
Subject: Re: [PATCH v2] log: make --follow following renames for non-linear history optional
Date: Mon, 16 Nov 2026 09:01:05 +0100	[thread overview]
Message-ID: <avq4QewLSGVLkCjv@pks.im> (raw)
In-Reply-To: <avqyVuMvKeQshZYS@collabora.com>

On Mon, Nov 16, 2026 at 08:35:50AM +0100, Miklos Vajna wrote:
[snip]
> > > +	if (opt->diffopt.flags.follow_renames &&
> > > +	    opt->diffopt.flags.follow_merges) {
> ...
> > 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.
> 
> My thinking was that follow_merges is a modifier of follow_renames. If
> some code path clears follow_renames later (like builtin/blame.c does)
> without knowing about follow_merges, checking both flags means that we
> still skip the per-parent rename diffs. So I would keep it as-is.

Makes sense.

One hint: please reply to review feedback on the mail that gave the
feedback instead of posting it as part of v2. That makes it easier for
others to see which review feedback was addressed.

> Range-diff against v1:
> 1:  cdf63f7017 ! 1:  cd19ed03cc log: make --follow following renames for non-linear history optional
>     @@ Documentation/config/log.adoc: This is the same as the `--decorate` option of th
>      -	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.
>     ++	`--follow=merges` option was used, which follows the path separately
>     ++	for each parent of a merge, but is more expensive.
>       
>       `log.graphColors`::
>       	A list of colors, separated by commas, that can be used to draw

Good, this gives the user the necessary context to decide why they may
or may not want to enable this config.

>     @@ builtin/log.c: static int git_log_config(const char *var, const char *value,
>       	}
>       	if (!strcmp(var, "log.follow")) {
>      -		cfg->default_follow = git_config_bool(var, value);
>     -+		if (value && !strcmp(value, "merges"))
>     ++		int b = git_parse_maybe_bool(value);
>     ++		if (b >= 0)
>     ++			cfg->default_follow = b;
>     ++		else if (!strcmp(value, "merges"))
>      +			cfg->default_follow = 2;
>      +		else
>     -+			cfg->default_follow = git_config_bool(var, value);
>     ++			return error(_("invalid value for '%s': '%s'"),
>     ++				     var, value);

And this fixes the broken error message when an invalid value was
passed.

Thanks, this version looks good to me.

Patrick

  reply	other threads:[~2026-11-16  8:01 UTC|newest]

Thread overview: 48+ 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-11-09  8:02                 ` Miklos Vajna
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-09  8:03                 ` Miklos Vajna
2026-11-06 14:14             ` [PATCH v4 0/6] log: speed up --follow following renames for non-linear history Patrick Steinhardt
2026-11-09  8:01               ` Miklos Vajna
2026-11-09  8:03             ` [PATCH v5 0/5] " Miklos Vajna
2026-11-09  8:04               ` [PATCH v5 1/5] t4219: test more --follow cases across merges Miklos Vajna
2026-11-10 23:06                 ` Justin Tobler
2026-11-09  8:05               ` [PATCH v5 2/5] log: extract showing the remerge/combined diff of a merge commit Miklos Vajna
2026-11-09  8:05               ` [PATCH v5 3/5] log: fix -m --follow losing the history of later parents Miklos Vajna
2026-11-09  8:05               ` [PATCH v5 4/5] log: simplify --follow following renames for non-linear history Miklos Vajna
2026-11-10 16:45                 ` Toon Claes
2026-11-09  8:06               ` [PATCH v5 5/5] log: speed up " Miklos Vajna
2026-11-11  0:40               ` [PATCH v5 0/5] " Justin Tobler
2026-11-11 10:43                 ` Patrick Steinhardt
2026-11-11 12:41                   ` Miklos Vajna
2026-11-11 13:29                     ` Patrick Steinhardt
2026-11-12  9:05                       ` [PATCH] log: make --follow following renames for non-linear history optional Miklos Vajna
2026-11-12 19:09                         ` Junio C Hamano
2026-11-13  7:00                         ` Patrick Steinhardt
2026-11-16  7:35                           ` [PATCH v2] " Miklos Vajna
2026-11-16  8:01                             ` Patrick Steinhardt [this message]
2026-11-16 17:39                               ` Junio C Hamano
2026-11-17  7:11                               ` Miklos Vajna
2026-11-11 16:44                 ` [PATCH v5 0/5] log: speed up --follow following renames for non-linear history Junio C Hamano
2026-10-16 20:37     ` [PATCH] " 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=avq4QewLSGVLkCjv@pks.im \
    --to=ps@pks.im \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jltobler@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.