[PATCH v3 2/4] log: extract showing the remerge/combined diff of a merge commit
- From
Miklos Vajna <vmiklos@collabora.com>
- Date
- Oct 22, 2026, 20:46 UTC
- Message-ID
- <2e734ef5a07f3d92eabee6864d3968b90a8ad7f1.1792701579.git.vmiklos@collabora.com>
- In-Reply-To
- <cover.1792701579.git.vmiklos@collabora.com>
No functional changes intended. A later commit in this series will also call log_tree_merge_diff() after the parent loop of log_tree_diff(), so extract that code to a function to avoid duplicating it.
Signed-off-by: Miklos Vajna <vmiklos@collabora.com> --- log-tree.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-)
diff --git a/log-tree.c b/log-tree.c index 83a3c4bf9b..b4c97b86f5 100644 --- a/log-tree.c +++ b/log-tree.c @@ -1180,6 +1180,26 @@ static void propagate_follow_pathspec_to_parent(struct rev_info *opt, diff_free(&diff_opts); } +/* Show the remerge or combined diff of a merge commit */ +static int log_tree_merge_diff(struct rev_info *opt, struct commit *commit, + struct commit_list *parents, + struct object_id *oid) +{ + int octopus = (parents->next->next != NULL); + + if (opt->remerge_diff) { + if (octopus) { + show_log(opt); + fprintf(opt->diffopt.file, + "diff: warning: Skipping remerge-diff " + "for octopus merges.\n"); + return 1; + } + return do_remerge_diff(opt, parents, oid); + } + return do_diff_combined(opt, commit); +} + /* * Show the diff of a commit. * @@ -1220,20 +1240,8 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log } if (is_merge) { - int octopus = (parents->next->next != NULL); - - if (opt->remerge_diff) { - if (octopus) { - show_log(opt); - fprintf(opt->diffopt.file, - "diff: warning: Skipping remerge-diff " - "for octopus merges.\n"); - return 1; - } - return do_remerge_diff(opt, parents, oid); - } - if (opt->combine_merges) - return do_diff_combined(opt, commit); + if (opt->remerge_diff || opt->combine_merges) + return log_tree_merge_diff(opt, commit, parents, oid); if (opt->separate_merges) { if (!opt->first_parent_merges) { /* Show parent info for multiple diffs */
-- 2.56.0