Merge branch 'jh/status-v2-porcelain'

diff --git a/wt-status.h b/wt-status.h
index 9389076f6944cc035a0f8bf4ae9664deaf88a18c..e40183770700cb593d4e4f2bf914a5b6eff0bb09 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -38,6 +38,9 @@ struct wt_status_change_data {
        int worktree_status;
        int index_status;
        int stagemask;
+       int score;
+       int mode_head, mode_index, mode_worktree;
+       struct object_id oid_head, oid_index;
        char *head_path;
        unsigned dirty_submodule       : 2;
        unsigned new_submodule_commits : 1;
@@ -48,6 +51,7 @@ enum wt_status_format {
        STATUS_FORMAT_LONG,
        STATUS_FORMAT_SHORT,
        STATUS_FORMAT_PORCELAIN,
+       STATUS_FORMAT_PORCELAIN_V2,
 
        STATUS_FORMAT_UNSPECIFIED
 };
@@ -76,6 +80,7 @@ struct wt_status {
        int hints;
 
        enum wt_status_format status_format;
+       unsigned char sha1_commit[GIT_SHA1_RAWSZ]; /* when not Initial */
 
        /* These are computed during processing of the individual sections */
        int commitable;