summaryrefslogtreecommitdiff
path: root/builtin/show-ref.c
diff options
context:
space:
mode:
authorLibravatar Stephen P. Smith <ischis2@cox.net>2018-09-05 17:53:29 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-09-07 14:39:05 -0700
commitf3bd35fa0dd6fcc8aaab1f9281d98cee5add2e4f (patch)
tree14e1360c7da90c6c8af1e60d008208c54439dca6 /builtin/show-ref.c
parentt7501: add test of "commit --dry-run --short" (diff)
downloadtgif-f3bd35fa0dd6fcc8aaab1f9281d98cee5add2e4f.tar.xz
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 'builtin/show-ref.c')
0 files changed, 0 insertions, 0 deletions