In an update to fix a bug with "commit --dry-run" it was found that the commitable flag was broken. The update was, at the time, accepted as it was better than the previous version. [1] Since the setting of the commitable flag had been done in wt_longstatus_print_updated, move it to wt_status_collect_updated_cb. Set the commitable flag in wt_status_collect_changes_initial to keep from introducing a rebase regression. Instead of setting the commitable flag in show_merge_in_progress, in wt_status_cllect check for a merge that has not been committed. If present then set the commitable flag. Change the tests to expect success since updates to the wt-status broken code section is being fixed. [1] https://public-inbox.org/git/xmqqr3gcj9i5.fsf@xxxxxxxxxxxxxxxxxxxxxxxxxxx/ Signed-off-by: Stephen P. Smith <ischis2@xxxxxxx> --- t/t7501-commit.sh | 6 +++--- wt-status.c | 13 +++++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index 5812dc2f8..4cda088cc 100755 --- a/t/t7501-commit.sh +++ b/t/t7501-commit.sh @@ -99,12 +99,12 @@ test_expect_success '--dry-run with stuff to commit returns ok' ' git commit -m next -a --dry-run ' -test_expect_failure '--short with stuff to commit returns ok' ' +test_expect_success '--short with stuff to commit returns ok' ' echo bongo bongo bongo >>file && git commit -m next -a --short ' -test_expect_failure '--porcelain with stuff to commit returns ok' ' +test_expect_success '--porcelain with stuff to commit returns ok' ' echo bongo bongo bongo >>file && git commit -m next -a --porcelain ' @@ -682,7 +682,7 @@ test_expect_success '--dry-run with conflicts fixed from a merge' ' git commit -m "conflicts fixed from merge." ' -test_expect_failure '--dry-run --short' ' +test_expect_success '--dry-run --short' ' # setup two branches with conflicting information # in the same file, resolve the conflict >test-file && diff --git a/wt-status.c b/wt-status.c index 180faf6ba..578328979 100644 --- a/wt-status.c +++ b/wt-status.c @@ -540,10 +540,12 @@ static void wt_status_collect_updated_cb(struct diff_queue_struct *q, /* Leave {mode,oid}_head zero for an add. */ d->mode_index = p->two->mode; oidcpy(&d->oid_index, &p->two->oid); + s->commitable = 1; break; case DIFF_STATUS_DELETED: d->mode_head = p->one->mode; oidcpy(&d->oid_head, &p->one->oid); + s->commitable = 1; /* Leave {mode,oid}_index zero for a delete. */ break; @@ -561,6 +563,7 @@ static void wt_status_collect_updated_cb(struct diff_queue_struct *q, d->mode_index = p->two->mode; oidcpy(&d->oid_head, &p->one->oid); oidcpy(&d->oid_index, &p->two->oid); + s->commitable = 1; break; case DIFF_STATUS_UNMERGED: d->stagemask = unmerged_mask(p->two->path); @@ -665,11 +668,13 @@ static void wt_status_collect_changes_initial(struct wt_status *s) * code will output the stage values directly and not use the * values in these fields. */ + s->commitable = 1; } else { d->index_status = DIFF_STATUS_ADDED; /* Leave {mode,oid}_head zero for adds. */ d->mode_index = ce->ce_mode; oidcpy(&d->oid_index, &ce->oid); + s->commitable = 1; } } } @@ -739,6 +744,7 @@ static int has_unmerged(struct wt_status *s) void wt_status_collect(struct wt_status *s) { + struct wt_status_state state; wt_status_collect_changes_worktree(s); if (s->is_initial) @@ -746,6 +752,11 @@ void wt_status_collect(struct wt_status *s) else wt_status_collect_changes_index(s); wt_status_collect_untracked(s); + + memset(&state, 0, sizeof(state)); + wt_status_get_state(&state, s->branch && !strcmp(s->branch, "HEAD")); + if (state.merge_in_progress && !has_unmerged(s)) + s->commitable = 1; } static void wt_longstatus_print_unmerged(struct wt_status *s) @@ -786,7 +797,6 @@ static void wt_longstatus_print_updated(struct wt_status *s) continue; if (!shown_header) { wt_longstatus_print_cached_header(s); - s->commitable = 1; shown_header = 1; } wt_longstatus_print_change_data(s, WT_STATUS_UPDATED, it); @@ -1089,7 +1099,6 @@ static void show_merge_in_progress(struct wt_status *s, _(" (use \"git merge --abort\" to abort the merge)")); } } else { - s-> commitable = 1; status_printf_ln(s, color, _("All conflicts fixed but you are still merging.")); if (s->hints) -- 2.18.0
