Merge branch 'ks/rebase-no-git-foo'

diff --git a/wt-status.c b/wt-status.c
index 937a87bbd59d1ec6968380d174c3dc8226c47892..ef26f0744632fdcca919e68ffc58bf414b29e597 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -2267,8 +2267,10 @@ int has_unstaged_changes(int ignore_submodules)
        int result;
 
        init_revisions(&rev_info, NULL);
-       if (ignore_submodules)
+       if (ignore_submodules) {
                rev_info.diffopt.flags.ignore_submodules = 1;
+               rev_info.diffopt.flags.override_submodule_config = 1;
+       }
        rev_info.diffopt.flags.quick = 1;
        diff_setup_done(&rev_info.diffopt);
        result = run_diff_files(&rev_info, 0);