Merge branch 'jk/mailmap-only-at-root'

[thirdparty/git.git] / wt-status.c

diff --git a/wt-status.c b/wt-status.c
index 7074bbdd53cc1141c75546ad6e009b5ac74a63c2..0c8287a023e4d834f7b0a5a437f1b89c18f7c05c 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -606,7 +606,9 @@ static void wt_status_collect_changes_worktree(struct wt_status *s)
        if (s->ignore_submodule_arg) {
                rev.diffopt.flags.override_submodule_config = 1;
                handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
-       }
+       } else if (!rev.diffopt.flags.ignore_submodule_set &&
+                       s->show_untracked_files != SHOW_NO_UNTRACKED_FILES)
+               handle_ignore_submodules_arg(&rev.diffopt, "none");
        rev.diffopt.format_callback = wt_status_collect_changed_cb;
        rev.diffopt.format_callback_data = s;
        rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
@@ -1742,9 +1744,9 @@ static void wt_longstatus_print(struct wt_status *s)
                        } else if (s->state.detached_from) {
                                branch_name = s->state.detached_from;
                                if (s->state.detached_at)
-                                       on_what = HEAD_DETACHED_AT;
+                                       on_what = _("HEAD detached at ");
                                else
-                                       on_what = HEAD_DETACHED_FROM;
+                                       on_what = _("HEAD detached from ");
                        } else {
                                branch_name = "";
                                on_what = _("Not currently on any branch.");