| 1550 | } |
| 1551 | |
| 1552 | static void show_cherry_pick_in_progress(struct wt_status *s, |
| 1553 | const char *color) |
| 1554 | { |
| 1555 | if (is_null_oid(&s->state.cherry_pick_head_oid)) |
| 1556 | status_printf_ln(s, color, |
| 1557 | _("Cherry-pick currently in progress.")); |
| 1558 | else |
| 1559 | status_printf_ln(s, color, |
| 1560 | _("You are currently cherry-picking commit %s."), |
| 1561 | repo_find_unique_abbrev(s->repo, &s->state.cherry_pick_head_oid, |
| 1562 | DEFAULT_ABBREV)); |
| 1563 | |
| 1564 | if (s->hints) { |
| 1565 | if (has_unmerged(s)) |
| 1566 | status_printf_ln(s, color, |
| 1567 | _(" (fix conflicts and run \"git cherry-pick --continue\")")); |
| 1568 | else if (is_null_oid(&s->state.cherry_pick_head_oid)) |
| 1569 | status_printf_ln(s, color, |
| 1570 | _(" (run \"git cherry-pick --continue\" to continue)")); |
| 1571 | else |
| 1572 | status_printf_ln(s, color, |
| 1573 | _(" (all conflicts fixed: run \"git cherry-pick --continue\")")); |
| 1574 | status_printf_ln(s, color, |
| 1575 | _(" (use \"git cherry-pick --skip\" to skip this patch)")); |
| 1576 | status_printf_ln(s, color, |
| 1577 | _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)")); |
| 1578 | } |
| 1579 | wt_longstatus_print_trailer(s); |
| 1580 | } |
| 1581 | |
| 1582 | static void show_revert_in_progress(struct wt_status *s, |
| 1583 | const char *color) |
no test coverage detected