Merge branch 'js/azure-pipelines-msvc'

[thirdparty/git.git] / wt-status.h

diff --git a/wt-status.h b/wt-status.h
index 64f1ddc9fd9950f7dbe3b0889bf2085111814cec..71c3f25f43deffd56cb6cc73cb76b3cbfaa66290 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -1,7 +1,6 @@
 #ifndef STATUS_H
 #define STATUS_H
 
-#include <stdio.h>
 #include "string-list.h"
 #include "color.h"
 #include "pathspec.h"
@@ -65,6 +64,9 @@ enum wt_status_format {
        STATUS_FORMAT_UNSPECIFIED
 };
 
+#define HEAD_DETACHED_AT _("HEAD detached at ")
+#define HEAD_DETACHED_FROM _("HEAD detached from ")
+
 struct wt_status_state {
        int merge_in_progress;
        int am_in_progress;
@@ -114,7 +116,7 @@ struct wt_status {
        int rename_limit;
        enum wt_status_format status_format;
        struct wt_status_state state;
-       unsigned char sha1_commit[GIT_MAX_RAWSZ]; /* when not Initial */
+       struct object_id oid_commit; /* when not Initial */
 
        /* These are computed during processing of the individual sections */
        int committable;