diff options
| author | Stephen P. Smith <ischis2@cox.net> | 2016-02-15 19:38:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-17 08:53:11 -0800 |
| commit | 8dc874b2ee61f0c457c4482ed2f202cac55b52ad (patch) | |
| tree | 06b75f7a95b428f85baaa1848764204c67fda9c0 /wt-status.c | |
| parent | a2558fb8e1e387b630312311e1d22c95663da5d0 (diff) | |
| download | git-8dc874b2ee61f0c457c4482ed2f202cac55b52ad.tar.gz | |
wt-status.c: set commitable bit if there is a meaningful merge.ss/commit-dry-run-resolve-merge-to-no-op
The 'commit --dry-run' and 'commit' return values differed if a
conflicted merge had been resolved and the resulting commit would
record the same tree as the parent.
Update show_merge_in_progress to set the commitable bit if conflicts
have been resolved and a merge is in progress.
Signed-off-by: Stephen P. Smith <ischis2@cox.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/wt-status.c b/wt-status.c index 078a472743..6be55ae887 100644 --- a/wt-status.c +++ b/wt-status.c @@ -949,6 +949,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) |