| 1580 | } |
| 1581 | |
| 1582 | static void show_revert_in_progress(struct wt_status *s, |
| 1583 | const char *color) |
| 1584 | { |
| 1585 | if (is_null_oid(&s->state.revert_head_oid)) |
| 1586 | status_printf_ln(s, color, |
| 1587 | _("Revert currently in progress.")); |
| 1588 | else |
| 1589 | status_printf_ln(s, color, |
| 1590 | _("You are currently reverting commit %s."), |
| 1591 | repo_find_unique_abbrev(s->repo, &s->state.revert_head_oid, |
| 1592 | DEFAULT_ABBREV)); |
| 1593 | if (s->hints) { |
| 1594 | if (has_unmerged(s)) |
| 1595 | status_printf_ln(s, color, |
| 1596 | _(" (fix conflicts and run \"git revert --continue\")")); |
| 1597 | else if (is_null_oid(&s->state.revert_head_oid)) |
| 1598 | status_printf_ln(s, color, |
| 1599 | _(" (run \"git revert --continue\" to continue)")); |
| 1600 | else |
| 1601 | status_printf_ln(s, color, |
| 1602 | _(" (all conflicts fixed: run \"git revert --continue\")")); |
| 1603 | status_printf_ln(s, color, |
| 1604 | _(" (use \"git revert --skip\" to skip this patch)")); |
| 1605 | status_printf_ln(s, color, |
| 1606 | _(" (use \"git revert --abort\" to cancel the revert operation)")); |
| 1607 | } |
| 1608 | wt_longstatus_print_trailer(s); |
| 1609 | } |
| 1610 | |
| 1611 | static void show_bisect_in_progress(struct wt_status *s, |
| 1612 | const char *color) |
no test coverage detected