| 1286 | } |
| 1287 | |
| 1288 | static void show_am_in_progress(struct wt_status *s, |
| 1289 | const char *color) |
| 1290 | { |
| 1291 | int am_empty_patch; |
| 1292 | |
| 1293 | status_printf_ln(s, color, |
| 1294 | _("You are in the middle of an am session.")); |
| 1295 | if (s->state.am_empty_patch) |
| 1296 | status_printf_ln(s, color, |
| 1297 | _("The current patch is empty.")); |
| 1298 | if (s->hints) { |
| 1299 | am_empty_patch = s->state.am_empty_patch; |
| 1300 | if (!am_empty_patch) |
| 1301 | status_printf_ln(s, color, |
| 1302 | _(" (fix conflicts and then run \"git am --continue\")")); |
| 1303 | status_printf_ln(s, color, |
| 1304 | _(" (use \"git am --skip\" to skip this patch)")); |
| 1305 | if (am_empty_patch) |
| 1306 | status_printf_ln(s, color, |
| 1307 | _(" (use \"git am --allow-empty\" to record this patch as an empty commit)")); |
| 1308 | status_printf_ln(s, color, |
| 1309 | _(" (use \"git am --abort\" to restore the original branch)")); |
| 1310 | } |
| 1311 | wt_longstatus_print_trailer(s); |
| 1312 | } |
| 1313 | |
| 1314 | static char *read_line_from_git_path(struct repository *r, const char *filename) |
| 1315 | { |
no test coverage detected