Merge branch 'jc/push-cas'

diff --git a/wt-status.h b/wt-status.h
index fac16cadca4e481304b3afaf65bd6979d66fdd78..9341c569a52e53cc939fa3bd94e013bbc2c8444d 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;