summaryrefslogtreecommitdiff
path: root/wt-status.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-23 14:54:28 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-23 14:54:28 -0700
commit9ce2824e4ba56bf0f2017a0e351fa35c22a705ac (patch)
tree799aa15994da31edcbd4dc6b79a3c4b3e6458ac9 /wt-status.c
parent3916adf9978b020f9a9b165f4c1c109046899560 (diff)
parent8dc874b2ee61f0c457c4482ed2f202cac55b52ad (diff)
downloadgit-9ce2824e4ba56bf0f2017a0e351fa35c22a705ac.tar.gz
Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op'
"git commit --dry-run" reported "No, no, you cannot commit." in one case where "git commit" would have allowed you to commit, and this improves it a little bit ("git commit --dry-run --short" still does not give you the correct answer, for example). This is a stop-gap measure in that "commit --short --dry-run" still gives an incorrect result. * ss/commit-dry-run-resolve-merge-to-no-op: wt-status.c: set commitable bit if there is a meaningful merge.
Diffstat (limited to 'wt-status.c')
-rw-r--r--wt-status.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/wt-status.c b/wt-status.c
index 1ea2ebe4c0..16856305ca 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -950,6 +950,7 @@ static void show_merge_in_progress(struct wt_status *s,
status_printf_ln(s, color,
_(" (fix conflicts and run \"git commit\")"));
} else {
+ s-> commitable = 1;
status_printf_ln(s, color,
_("All conflicts fixed but you are still merging."));
if (s->hints)