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.
Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
---
merge-recursive.c | 7 +++----
sequencer.c | 1 -
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index b762ecd7bd..7f56cb0ed1 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -3583,9 +3583,6 @@ static int merge_recursive_internal(struct merge_options *opt,
flush_output(opt);
if (!opt->call_depth && opt->buffer_output < 2)
strbuf_release(&opt->obuf);
- if (show(opt, 2))
- diff_warn_rename_limit("merge.renamelimit",
- opt->needed_rename_limit, 0);
return clean;
}
@@ -3606,7 +3603,9 @@ static int merge_start(struct merge_options *opt, struct tree *head)
static void merge_finalize(struct merge_options *opt)
{
- /* Common code for wrapping up merges will be added here later */
+ if (show(opt, 2))
+ diff_warn_rename_limit("merge.renamelimit",
+ opt->needed_rename_limit, 0);
}
int merge_trees(struct merge_options *opt,
diff --git a/sequencer.c b/sequencer.c
index 34ebf8ed94..c85e594704 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -617,7 +617,6 @@ static int do_recursive_merge(struct repository *r,
if (is_rebase_i(opts) && clean <= 0)
fputs(o.obuf.buf, stdout);
strbuf_release(&o.obuf);
- diff_warn_rename_limit("merge.renamelimit", o.needed_rename_limit, 0);
if (clean < 0) {
rollback_lock_file(&index_lock);
return clean;
--
2.22.0.559.g28a8880890.dirty
