From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Oct 2018 04:34:02 +0000 (+0900)
Subject: Merge branch 'ss/wt-status-committable'
X-Git-Tag: v2.20.0-rc0~163
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/929e85ade811a1adaa573f79130b35843bed805e

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
---

929e85ade811a1adaa573f79130b35843bed805e
diff --cc builtin/commit.c
index 79d557fb2b,e168321e49..31b44e5d62
--- a/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";