pull: propagate --progress to merge

diff --git a/merge-recursive.c b/merge-recursive.c
index 089aa10cc1df7e8ad129471ed1b027843d057800..6c8f95771231e0b0d5400e6c4b9af17fffeedbe7 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -441,6 +441,7 @@ static struct string_list *get_renames(struct merge_options *o,
                            o->diff_rename_limit >= 0 ? o->diff_rename_limit :
                            1000;
        opts.rename_score = o->rename_score;
+       opts.show_rename_progress = o->show_rename_progress;
        opts.output_format = DIFF_FORMAT_NO_OUTPUT;
        if (diff_setup_done(&opts) < 0)
                die("diff setup failed");