progress: fix progress meters when dealing with lots of work
[gitweb.git] / sequencer.c
index 6d027b06c8d8dc69b14d05752637a65aa121ab24..1aa769c82d503d4bca56859d29a1d003282868a5 100644 (file)
@@ -462,6 +462,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;