status: factor two rebase-related messages together

diff --git a/wt-status.c b/wt-status.c
index 4313b9d8457037bcaef03399a852ef91198861ba..9e0559c0c8c361ee12056ef183c83f095dea2eea 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -585,6 +585,8 @@ static void wt_status_collect_untracked(struct wt_status *s)
                        DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
        if (s->show_ignored_files)
                dir.flags |= DIR_SHOW_IGNORED_TOO;
+       else
+               dir.untracked = the_index.untracked;
        setup_standard_excludes(&dir);
 
        fill_directory(&dir, &s->pathspec);
@@ -1024,6 +1026,20 @@ static int split_commit_in_progress(struct wt_status *s)
        return split_in_progress;
 }
 
+static void print_rebase_state(struct wt_status *s,
+                               struct wt_status_state *state,
+                               const char *color)
+{
+       if (state->branch)
+               status_printf_ln(s, color,
+                                _("You are currently rebasing branch '%s' on '%s'."),
+                                state->branch,
+                                state->onto);
+       else
+               status_printf_ln(s, color,
+                                _("You are currently rebasing."));
+}
+
 static void show_rebase_in_progress(struct wt_status *s,
                                struct wt_status_state *state,
                                const char *color)
@@ -1031,14 +1047,7 @@ static void show_rebase_in_progress(struct wt_status *s,
        struct stat st;
 
        if (has_unmerged(s)) {
-               if (state->branch)
-                       status_printf_ln(s, color,
-                                        _("You are currently rebasing branch '%s' on '%s'."),
-                                        state->branch,
-                                        state->onto);
-               else
-                       status_printf_ln(s, color,
-                                        _("You are currently rebasing."));
+               print_rebase_state(s, state, color);
                if (s->hints) {
                        status_printf_ln(s, color,
                                _("  (fix conflicts and then run \"git rebase --continue\")"));
@@ -1048,14 +1057,7 @@ static void show_rebase_in_progress(struct wt_status *s,
                                _("  (use \"git rebase --abort\" to check out the original branch)"));
                }
        } else if (state->rebase_in_progress || !stat(git_path("MERGE_MSG"), &st)) {
-               if (state->branch)
-                       status_printf_ln(s, color,
-                                        _("You are currently rebasing branch '%s' on '%s'."),
-                                        state->branch,
-                                        state->onto);
-               else
-                       status_printf_ln(s, color,
-                                        _("You are currently rebasing."));
+               print_rebase_state(s, state, color);
                if (s->hints)
                        status_printf_ln(s, color,
                                _("  (all conflicts fixed: run \"git rebase --continue\")"));
@@ -1544,6 +1546,7 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
        base = shorten_unambiguous_ref(base, 0);
        color_fprintf(s->fp, header_color, "...");
        color_fprintf(s->fp, branch_color_remote, "%s", base);
+       free((char *)base);
 
        if (!upstream_is_gone && !num_ours && !num_theirs) {
                fputc(s->null_termination ? '\0' : '\n', s->fp);