summaryrefslogtreecommitdiff
path: root/wt-status.h
diff options
context:
space:
mode:
Diffstat (limited to 'wt-status.h')
-rw-r--r--wt-status.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/wt-status.h b/wt-status.h
index fb7152e187..283a9fef03 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -44,12 +44,14 @@ struct wt_status {
int is_initial;
char *branch;
const char *reference;
- const char **pathspec;
+ struct pathspec pathspec;
int verbose;
int amend;
enum commit_whence whence;
int nowarn;
int use_color;
+ int no_gettext;
+ int display_comment_prefix;
int relative_paths;
int submodule_summary;
int show_ignored_files;
@@ -59,6 +61,7 @@ struct wt_status {
unsigned colopts;
int null_termination;
int show_branch;
+ int hints;
/* These are computed during processing of the individual sections */
int commitable;
@@ -86,8 +89,11 @@ 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_add_cut_line(FILE *fp);
void wt_status_prepare(struct wt_status *s);
void wt_status_print(struct wt_status *s);
void wt_status_collect(struct wt_status *s);