Merge branch 'bw/rebase-i-ignored-submodule-fix'

"git rebase -i" recently started misbehaving when a submodule that
is configured with 'submodule.<name>.ignore' is dirty; this has
been corrected.

* bw/rebase-i-ignored-submodule-fix:
wt-status: actually ignore submodules when requested

diff --cc wt-status.c
index 937a87bbd59d1ec6968380d174c3dc8226c47892,7346a89ef25d92506e45a63497c7a3f5fa07abce..ef26f0744632fdcca919e68ffc58bf414b29e597
--- 1/wt-status.c
--- 2/wt-status.c
+++ b/wt-status.c
@@@ -2267,9 -2262,11 +2267,11 @@@ int has_unstaged_changes(int ignore_sub
        int result;
  
        init_revisions(&rev_info, NULL);
-       if (ignore_submodules)
+       if (ignore_submodules) {
 -              DIFF_OPT_SET(&rev_info.diffopt, IGNORE_SUBMODULES);
 -              DIFF_OPT_SET(&rev_info.diffopt, OVERRIDE_SUBMODULE_CONFIG);
 +              rev_info.diffopt.flags.ignore_submodules = 1;
++              rev_info.diffopt.flags.override_submodule_config = 1;
+       }
 -      DIFF_OPT_SET(&rev_info.diffopt, QUICK);
 +      rev_info.diffopt.flags.quick = 1;
        diff_setup_done(&rev_info.diffopt);
        result = run_diff_files(&rev_info, 0);
        return diff_result_code(&rev_info.diffopt, result);