transport-helper: add 'force' to 'export' helpers

diff --git a/wt-status.h b/wt-status.h
index fac16cadca4e481304b3afaf65bd6979d66fdd78..6c29e6f5e57f84eb7acdc3cf1ee621cc717fd5a9 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -44,7 +44,7 @@ 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;
@@ -60,6 +60,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;
@@ -87,6 +88,7 @@ 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_prepare(struct wt_status *s);