@matheusbsbs / matheus-bagliano / commits / 345480d1ed

merge-recursive: don't force external callers to do our logging

Alternatively, you can view this as "make the merge functions behave more similarly." merge-recursive has three different entry points: merge_trees(), merge_recursive(), and merge_recursive_generic(). Two of these would call diff_warn_rename_limit(), but merge_trees() didn't. This lead to callers of merge_trees() needing to manually call diff_warn_rename_limit() themselves. Move this to the new merge_finalize() function to make sure that all three entry points run this function. Note that there are two external callers of merge_trees(), one in sequencer.c and one in builtin/checkout.c. The one in sequencer.c is cleaned up by this patch and just transfers where the call to diff_warn_rename_limit() is made; the one in builtin/checkout.c is for switching to a different commit and in the very rare case where the warning might be triggered, it would probably be helpful to include (e.g. if someone is modifying a file that has been renamed in moving to the other commit, but there are so many renames between the commits that the limit kicks in and none are detected, it may help to have an explanation about why they got a delete/modify conflict instead of a proper content merge in a renamed file). Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Elijah Newren committed Aug 17, 2019 at 11:41 UTC 345480d1ed462135d98e99cb5b5a426da27257c8

2 files changed +3 -5

merge-recursive.c

+3 -4

@@ -3595,9 +3595,6 @@ static int merge_recursive_internal(struct merge_options *opt,

3595 flush_output(opt);

3596 if (!opt->call_depth && opt->buffer_output < 2)

3597 strbuf_release(&opt->obuf);

3598 - if (show(opt, 2))

3599 - diff_warn_rename_limit("merge.renamelimit",

3600 - opt->needed_rename_limit, 0);

3598 return clean;

3599 }

3600

@@ -3617,7 +3614,9 @@ static int merge_start(struct merge_options *opt, struct tree *head)

3614

3615 static void merge_finalize(struct merge_options *opt)

3616 {

3620 - /* Common code for wrapping up merges will be added here later */

3617 + if (show(opt, 2))

3618 + diff_warn_rename_limit("merge.renamelimit",

3619 + opt->needed_rename_limit, 0);

3620 }

3621

3622 int merge_trees(struct merge_options *opt,

sequencer.c

-1

@@ -617,7 +617,6 @@ static int do_recursive_merge(struct repository *r,

617 if (is_rebase_i(opts) && clean <= 0)

618 fputs(o.obuf.buf, stdout);

619 strbuf_release(&o.obuf);

620 - diff_warn_rename_limit("merge.renamelimit", o.needed_rename_limit, 0);

620 if (clean < 0) {

621 rollback_lock_file(&index_lock);

622 return clean;