ci: fix GCC install in the Travis CI GCC OSX job

[thirdparty/git.git] / wt-status.c

diff --git a/wt-status.c b/wt-status.c
index 9f6c65a5809754717f8c51f809eae78f435bcd12..cc6f94504d9fa9f7ec80f5131996a10c878c26cb 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -1433,6 +1433,8 @@ static void show_cherry_pick_in_progress(struct wt_status *s,
                else
                        status_printf_ln(s, color,
                                _("  (all conflicts fixed: run \"git cherry-pick --continue\")"));
+               status_printf_ln(s, color,
+                       _("  (use \"git cherry-pick --skip\" to skip this patch)"));
                status_printf_ln(s, color,
                        _("  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
        }
@@ -1460,6 +1462,8 @@ static void show_revert_in_progress(struct wt_status *s,
                else
                        status_printf_ln(s, color,
                                _("  (all conflicts fixed: run \"git revert --continue\")"));
+               status_printf_ln(s, color,
+                       _("  (use \"git revert --skip\" to skip this patch)"));
                status_printf_ln(s, color,
                        _("  (use \"git revert --abort\" to cancel the revert operation)"));
        }
@@ -2025,7 +2029,7 @@ static void wt_porcelain_v2_print_tracking(struct wt_status *s)
        char eol = s->null_termination ? '\0' : '\n';
 
        fprintf(s->fp, "# branch.oid %s%c",
-                       (s->is_initial ? "(initial)" : sha1_to_hex(s->sha1_commit)),
+                       (s->is_initial ? "(initial)" : oid_to_hex(&s->oid_commit)),
                        eol);
 
        if (!s->branch)