diff options
author | Stephen P. Smith <ischis2@cox.net> | 2018-09-06 03:53:29 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-09-08 00:39:05 +0300 |
commit | f3bd35fa0dd6fcc8aaab1f9281d98cee5add2e4f (patch) | |
tree | 14e1360c7da90c6c8af1e60d008208c54439dca6 /wt-status.h | |
parent | 8282f59f90b8d864f245dd04a79106b9e620e137 (diff) |
wt-status.c: set the committable flag in the collect phase
In an update to fix a bug with "commit --dry-run" it was found that
the committable flag was broken. The update was, at the time, accepted
as it was better than the previous version. [1]
Since the setting of the committable flag had been done in
wt_longstatus_print_updated, move it to wt_status_collect_updated_cb.
Set the committable flag in wt_status_collect_changes_initial to keep
from introducing a rebase regression.
Instead of setting the committable flag in show_merge_in_progress, in
wt_status_cllect check for a merge that has not been committed. If
present then set the committable 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@gitster.mtv.corp.google.com/
Signed-off-by: Stephen P. Smith <ischis2@cox.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.h')
0 files changed, 0 insertions, 0 deletions