fsck: complain about HFS+ ".git" aliases in trees

[git.git] / wt-status.h

diff --git a/wt-status.h b/wt-status.h
index fb7152e187a2fe7c080aab1d84b7fd2cbe6c47a1..6c29e6f5e57f84eb7acdc3cf1ee621cc717fd5a9 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -44,12 +44,13 @@ 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 display_comment_prefix;
        int relative_paths;
        int submodule_summary;
        int show_ignored_files;
@@ -59,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;
@@ -86,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);