Merge branch 'ar/unconfuse-three-dots'

diff --git a/sequencer.c b/sequencer.c
index e90bc316bb7a232a40c332c6d1add255d3893869..c8cb20c1ebdd03f7897eb0ccecbb49d9ef9fd390 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -449,6 +449,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
        o.branch2 = next ? next_label : "(empty tree)";
        if (is_rebase_i(opts))
                o.buffer_output = 2;
+       o.show_rename_progress = 1;
 
        head_tree = parse_tree_indirect(head);
        next_tree = next ? next->tree : empty_tree();
@@ -463,6 +464,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
        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)
                return clean;