Merge branch 'rs/wt-status-cleanup'

Code cleanup.

* rs/wt-status-cleanup:
wt-status: use separate variable for result of shorten_unambiguous_ref

diff --combined wt-status.c
index 8d2fb35b08037a0e435573066d6e3f28e7529db4,fd863c81fc572f52843340ab7f57ae9a84436818..77c27c51134d2feff93befeee20f4523a37d524a
--- 1/wt-status.c
--- 2/wt-status.c
+++ b/wt-status.c
@@@ -137,7 -137,6 +137,7 @@@ void wt_status_prepare(struct wt_statu
        s->untracked.strdup_strings = 1;
        s->ignored.strdup_strings = 1;
        s->show_branch = -1;  /* unspecified */
 +      s->show_stash = 0;
        s->display_comment_prefix = 0;
  }
  
@@@ -666,7 -665,7 +666,7 @@@ static void wt_status_collect_untracked
                dir.untracked = the_index.untracked;
        setup_standard_excludes(&dir);
  
 -      fill_directory(&dir, &s->pathspec);
 +      fill_directory(&dir, &the_index, &s->pathspec);
  
        for (i = 0; i < dir.nr; i++) {
                struct dir_entry *ent = dir.entries[i];
@@@ -802,27 -801,6 +802,27 @@@ static void wt_longstatus_print_changed
        wt_longstatus_print_trailer(s);
  }
  
 +static int stash_count_refs(struct object_id *ooid, struct object_id *noid,
 +                          const char *email, timestamp_t timestamp, int tz,
 +                          const char *message, void *cb_data)
 +{
 +      int *c = cb_data;
 +      (*c)++;
 +      return 0;
 +}
 +
 +static void wt_longstatus_print_stash_summary(struct wt_status *s)
 +{
 +      int stash_count = 0;
 +
 +      for_each_reflog_ent("refs/stash", stash_count_refs, &stash_count);
 +      if (stash_count > 0)
 +              status_printf_ln(s, GIT_COLOR_NORMAL,
 +                               Q_("Your stash currently has %d entry",
 +                                  "Your stash currently has %d entries", stash_count),
 +                               stash_count);
 +}
 +
  static void wt_longstatus_print_submodule_summary(struct wt_status *s, int uncommitted)
  {
        struct child_process sm_summary = CHILD_PROCESS_INIT;
@@@ -1025,7 -1003,7 +1025,7 @@@ static void wt_longstatus_print_trackin
                color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c",
                                 comment_line_char);
        else
 -              fputs("", s->fp);
 +              fputs("\n", s->fp);
  }
  
  static int has_unmerged(struct wt_status *s)
@@@ -1088,8 -1066,7 +1088,8 @@@ static void show_am_in_progress(struct 
  static char *read_line_from_git_path(const char *filename)
  {
        struct strbuf buf = STRBUF_INIT;
 -      FILE *fp = fopen(git_path("%s", filename), "r");
 +      FILE *fp = fopen_or_warn(git_path("%s", filename), "r");
 +
        if (!fp) {
                strbuf_release(&buf);
                return NULL;
@@@ -1412,7 -1389,7 +1412,7 @@@ struct grab_1st_switch_cbdata 
  };
  
  static int grab_1st_switch(struct object_id *ooid, struct object_id *noid,
 -                         const char *email, unsigned long timestamp, int tz,
 +                         const char *email, timestamp_t timestamp, int tz,
                           const char *message, void *cb_data)
  {
        struct grab_1st_switch_cbdata *cb = cb_data;
@@@ -1453,7 -1430,7 +1453,7 @@@ static void wt_status_get_detached_from
            /* sha1 is a commit? match without further lookup */
            (!oidcmp(&cb.noid, &oid) ||
             /* perhaps sha1 is a tag, try to dereference to a commit */
 -           ((commit = lookup_commit_reference_gently(oid.hash, 1)) != NULL &&
 +           ((commit = lookup_commit_reference_gently(&oid, 1)) != NULL &&
              !oidcmp(&cb.noid, &commit->object.oid)))) {
                const char *from = ref;
                if (!skip_prefix(from, "refs/tags/", &from))
@@@ -1601,10 -1578,7 +1601,10 @@@ static void wt_longstatus_print(struct 
  
        if (s->is_initial) {
                status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
 -              status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));
 +              status_printf_ln(s, color(WT_STATUS_HEADER, s),
 +                               s->commit_template
 +                               ? _("Initial commit")
 +                               : _("No commits yet"));
                status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
        }
  
@@@ -1667,8 -1641,6 +1667,8 @@@
                } else
                        printf(_("nothing to commit, working tree clean\n"));
        }
 +      if(s->show_stash)
 +              wt_longstatus_print_stash_summary(s);
  }
  
  static void wt_shortstatus_unmerged(struct string_list_item *it,
@@@ -1763,6 -1735,7 +1763,7 @@@ static void wt_shortstatus_print_tracki
        const char *branch_color_remote = color(WT_STATUS_REMOTE_BRANCH, s);
  
        const char *base;
+       char *short_base;
        const char *branch_name;
        int num_ours, num_theirs;
        int upstream_is_gone = 0;
@@@ -1776,7 -1749,7 +1777,7 @@@
  #define LABEL(string) (s->no_gettext ? (string) : _(string))
  
        if (s->is_initial)
 -              color_fprintf(s->fp, header_color, LABEL(N_("Initial commit on ")));
 +              color_fprintf(s->fp, header_color, LABEL(N_("No commits yet on ")));
  
        if (!strcmp(s->branch, "HEAD")) {
                color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
@@@ -1797,10 -1770,10 +1798,10 @@@
                upstream_is_gone = 1;
        }
  
-       base = shorten_unambiguous_ref(base, 0);
+       short_base = shorten_unambiguous_ref(base, 0);
        color_fprintf(s->fp, header_color, "...");
-       color_fprintf(s->fp, branch_color_remote, "%s", base);
-       free((char *)base);
+       color_fprintf(s->fp, branch_color_remote, "%s", short_base);
+       free(short_base);
  
        if (!upstream_is_gone && !num_ours && !num_theirs)
                goto conclude;