Imported Upstream version 2.15.1

[platform/upstream/git.git] / wt-status.h

diff --git a/wt-status.h b/wt-status.h
index 6018c62..64f4d33 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -76,7 +76,9 @@ struct wt_status {
        char color_palette[WT_STATUS_MAXSLOT][COLOR_MAXLEN];
        unsigned colopts;
        int null_termination;
+       int commit_template;
        int show_branch;
+       int show_stash;
        int hints;
 
        enum wt_status_format status_format;
@@ -112,7 +114,7 @@ struct wt_status_state {
        unsigned char cherry_pick_head_sha1[20];
 };
 
-void wt_status_truncate_message_at_cut_line(struct strbuf *);
+size_t wt_status_locate_end(const char *s, size_t len);
 void wt_status_add_cut_line(FILE *fp);
 void wt_status_prepare(struct wt_status *s);
 void wt_status_print(struct wt_status *s);