kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

merge-ort: drop unused parameters from detect_and_process_renames() 

This function takes three trees representing the merge base and both
sides of the merge, but never looks at any of them. This is due to
f78cf97617 (merge-ort: call diffcore_rename() directly, 2021-02-14).
Prior to that commit, we passed pairs of trees to diff_tree_oid(). But
after that commit, we collect a custom diff_queue for each pair in the
merge_options struct, and just run diffcore_rename() on the result. So
the function does not need to know about the original trees at all
anymore.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2023-09-14 05:39:58 -04:00 committed by Junio C Hamano
parent 1c9419ae9d
commit fce9ffb225
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
merge-ort.c
View File

@ -3324,10 +3324,7 @@ static int collect_renames(struct merge_options *opt,
return clean; return clean;
} }


static int detect_and_process_renames(struct merge_options *opt, static int detect_and_process_renames(struct merge_options *opt)
struct tree *merge_base,
struct tree *side1,
struct tree *side2)
{ {
struct diff_queue_struct combined = { 0 }; struct diff_queue_struct combined = { 0 };
struct rename_info *renames = &opt->priv->renames; struct rename_info *renames = &opt->priv->renames;
@ -4964,8 +4961,7 @@ redo:
trace2_region_leave("merge", "collect_merge_info", opt->repo); trace2_region_leave("merge", "collect_merge_info", opt->repo);


trace2_region_enter("merge", "renames", opt->repo); trace2_region_enter("merge", "renames", opt->repo);
result->clean = detect_and_process_renames(opt, merge_base, result->clean = detect_and_process_renames(opt);
side1, side2);
trace2_region_leave("merge", "renames", opt->repo); trace2_region_leave("merge", "renames", opt->repo);
if (opt->priv->renames.redo_after_renames == 2) { if (opt->priv->renames.redo_after_renames == 2) {
trace2_region_enter("merge", "reset_maps", opt->repo); trace2_region_enter("merge", "reset_maps", opt->repo);