From: Patrick Steinhardt Date: Mon, 16 Nov 2026 08:01:05 GMT Subject: Re: [PATCH v2] log: make --follow following renames for non-linear history optional Message-ID: In-Reply-To: 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