From: Miklos Vajna Date: Mon, 09 Nov 2026 08:05:26 GMT Subject: [PATCH v5 3/5] log: fix -m --follow losing the history of later parents Message-ID: <85b6067fbda4fdf9a99ab81396dd1a2b89066954.1794078554.git.vmiklos@collabora.com> In-Reply-To: With 'git log -m --follow', a merge is diffed against each of its parents, with rename following. Take the diamond case of t4219: the two sides of a fork rename path0 to path1 and to path2, and the merge renames the file to path. Here 'git log -m --follow path' doesn't show "A: add path0" and "C: modify path0 on lower". The problem is that the parent loop in log_tree_diff() doesn't restore the followed path between parents. When the diff against the first parent finds a rename, the followed path is updated, and this has two effects. First, the second parent is diffed with the already renamed path, not with the path of the merge. Second, the path that propagate_follow_pathspec_to_parent() records for each parent also starts from that updated path, so history is lost on the side of the second parent. Without -m, merges are not diffed, so the followed path is not updated there. Fix the problem by saving the path of the merge before the parent loop, and restoring it before diffing each parent and after the loop. Do this only for merges: for a commit with a single parent, the renamed path is what --follow needs to continue with. Add a test for this, which shows the full history of the diamond case with -m. Signed-off-by: Miklos Vajna --- log-tree.c | 13 +++++++++++++ t/t4219-log-follow-merge.sh | 16 ++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/log-tree.c b/log-tree.c index b4c97b86f5..befc5c8b22 100644 --- a/log-tree.c +++ b/log-tree.c @@ -1212,6 +1212,7 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log struct object_id *oid; int is_merge; int all_need_diff = opt->diff || opt->diffopt.flags.exit_with_status; + char *path = NULL; if (!all_need_diff && !opt->merges_need_diff) return 0; @@ -1251,10 +1252,18 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log return 0; } + if (is_merge && opt->diffopt.flags.follow_renames) + path = xstrdup_or_null( + pathspec_single_path(&opt->diffopt.pathspec)); + showed_log = 0; for (;;) { struct commit *parent = parents->item; + /* Diff each parent with the path of the merge */ + if (path) + set_pathspec_to_single_path(&opt->diffopt.pathspec, + path); parse_commit_or_die(parent); diff_tree_oid(get_commit_tree_oid(parent), oid, "", &opt->diffopt); @@ -1269,6 +1278,10 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log log->parent = parents->item; opt->loginfo = log; } + /* Propagate to parents starting from the path of the merge, too */ + if (path) + set_pathspec_to_single_path(&opt->diffopt.pathspec, path); + free(path); return showed_log; } diff --git a/t/t4219-log-follow-merge.sh b/t/t4219-log-follow-merge.sh index 806ccc24bd..ac9ab85888 100755 --- a/t/t4219-log-follow-merge.sh +++ b/t/t4219-log-follow-merge.sh @@ -171,6 +171,22 @@ do ' done +test_expect_success '--follow follows renames through a fork with -m' ' + git -C diamond log --follow -m --pretty=tformat:%s path >log && + grep "^[A-Z]: " log | sort >actual && + cat >expect <<-\EOF && + A: add path0 + B: modify path0 on upper + C: modify path0 on lower + M: merge with rename to path + M: merge with rename to path + X: rename path0 to path1 + Y: rename path0 to path2 + Z: modify path + EOF + test_cmp expect actual +' + # Build a merge that takes the renamed path from the second parent, while the # first parent only has the old path. $2 decides which side is committed first, # which decides the walk order. -- 2.51.0