Merge branch 'ml/mailmap' into maint-1.7.6

diff --git a/wt-status.c b/wt-status.c
index 02377729c401fa6e041a713a89fe986fa0f562a0..c01838c5ad5d04996478350c01a9c49231a467bc 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -394,7 +394,7 @@ static void wt_status_collect_changes_worktree(struct wt_status *s)
        if (s->ignore_submodule_arg) {
                DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
                handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
-    }
+       }
        rev.diffopt.format_callback = wt_status_collect_changed_cb;
        rev.diffopt.format_callback_data = s;
        init_pathspec(&rev.prune_data, s->pathspec);