Merge branch 'ss/wt-status-committable'

Code clean-up in the internal machinery used by "git status" and
"git commit --dry-run".

* ss/wt-status-committable:
  roll wt_status_state into wt_status and populate in the collect phase
  wt-status.c: set the committable flag in the collect phase
  t7501: add test of "commit --dry-run --short"
  wt-status: rename commitable to committable
  wt-status.c: move has_unmerged earlier in the file

diff --cc builtin/commit.c
index 79d557fb2bb84a0174d40fe73e9137f5089c018a,e168321e490aa4c3f2f2f50a2b579511005c13d7..31b44e5d629db82781ee1bd1afc45a47c8936ba9
--- 1/builtin/commit.c
--- 2/builtin/commit.c
+++ b/builtin/commit.c
@@@ -872,9 -871,8 +873,9 @@@ static int prepare_to_commit(const cha
  
                saved_color_setting = s->use_color;
                s->use_color = 0;
-               commitable = run_status(s->fp, index_file, prefix, 1, s);
+               committable = run_status(s->fp, index_file, prefix, 1, s);
                s->use_color = saved_color_setting;
 +              string_list_clear(&s->change, 1);
        } else {
                struct object_id oid;
                const char *parent = "HEAD";

diff --cc t/t7501-commit.sh
Simple merge

diff --cc wt-status.c
Simple merge