Ignore dirty submodule states during rebase and stash

diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c
index 1293e3d342de89b6a8fe81c54a1abd16418acba8..46e636fdcf1cb854a486e425df05a2485d18d5d7 100644 (file)
--- a/builtin-merge-recursive.c
+++ b/builtin-merge-recursive.c
@@ -364,7 +364,8 @@ static struct path_list *get_renames(struct tree *tree,
        opts.detect_rename = DIFF_DETECT_RENAME;
        opts.rename_limit = merge_rename_limit >= 0 ? merge_rename_limit :
                            diff_rename_limit >= 0 ? diff_rename_limit :
-                           100;
+                           500;
+       opts.warn_on_too_large_rename = 1;
        opts.output_format = DIFF_FORMAT_NO_OUTPUT;
        if (diff_setup_done(&opts) < 0)
                die("diff setup failed");