Merge branch 'jk/cat-file-regression-fix'

diff --git a/wt-status.h b/wt-status.h
index 9341c569a52e53cc939fa3bd94e013bbc2c8444d..30a481258366733ad5d6a65e3a9c3ae1ee74e833 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -88,8 +88,10 @@ struct wt_status_state {
        char *detached_from;
        unsigned char detached_sha1[20];
        unsigned char revert_head_sha1[20];
+       unsigned char cherry_pick_head_sha1[20];
 };
 
+void wt_status_truncate_message_at_cut_line(struct strbuf *);
 void wt_status_prepare(struct wt_status *s);
 void wt_status_print(struct wt_status *s);
 void wt_status_collect(struct wt_status *s);