Merge branch 'mz/doc-rebase-abort' into maint

diff --git a/submodule.c b/submodule.c
index b6dec70bd1a6b35c8ecc6a1a9953d64bfe6c4510..1ba9646d3484fe2a11c1faba339c4e333186085e 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -388,6 +388,7 @@ void check_for_new_submodule_commits(unsigned char new_sha1[20])
                while (parent) {
                        struct diff_options diff_opts;
                        diff_setup(&diff_opts);
+                       DIFF_OPT_SET(&diff_opts, RECURSIVE);
                        diff_opts.output_format |= DIFF_FORMAT_CALLBACK;
                        diff_opts.format_callback = submodule_collect_changed_cb;
                        if (diff_setup_done(&diff_opts) < 0)