diff options
Diffstat (limited to 'wt-status.h')
-rw-r--r-- | wt-status.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/wt-status.h b/wt-status.h index 8849768e92..71c3f25f43 100644 --- a/wt-status.h +++ b/wt-status.h @@ -64,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; @@ -113,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; |