Commit 40f5555c authored by brian m. carlson's avatar brian m. carlson Committed by Junio C Hamano

wt-status: convert struct wt_status_state to object_id

Convert the various *_sha1 members to use struct object_id instead.
Signed-off-by: brian m. carlson's avatarbrian m. carlson <>
Signed-off-by: default avatarJunio C Hamano <>
parent 30e677e0
......@@ -1350,7 +1350,7 @@ static void show_cherry_pick_in_progress(struct wt_status *s,
const char *color)
status_printf_ln(s, color, _("You are currently cherry-picking commit %s."),
find_unique_abbrev(state->cherry_pick_head_sha1, DEFAULT_ABBREV));
find_unique_abbrev(state->cherry_pick_head_oid.hash, DEFAULT_ABBREV));
if (s->hints) {
if (has_unmerged(s))
status_printf_ln(s, color,
......@@ -1369,7 +1369,7 @@ static void show_revert_in_progress(struct wt_status *s,
const char *color)
status_printf_ln(s, color, _("You are currently reverting commit %s."),
find_unique_abbrev(state->revert_head_sha1, DEFAULT_ABBREV));
find_unique_abbrev(state->revert_head_oid.hash, DEFAULT_ABBREV));
if (s->hints) {
if (has_unmerged(s))
status_printf_ln(s, color,
......@@ -1490,9 +1490,9 @@ static void wt_status_get_detached_from(struct wt_status_state *state)
} else
state->detached_from =
xstrdup(find_unique_abbrev(cb.noid.hash, DEFAULT_ABBREV));
hashcpy(state->detached_sha1, cb.noid.hash);
oidcpy(&state->detached_oid, &cb.noid);
state->detached_at = !get_oid("HEAD", &oid) &&
!hashcmp(oid.hash, state->detached_sha1);
!oidcmp(&oid, &state->detached_oid);
......@@ -1551,13 +1551,13 @@ void wt_status_get_state(struct wt_status_state *state,
} else if (!stat(git_path_cherry_pick_head(), &st) &&
!get_oid("CHERRY_PICK_HEAD", &oid)) {
state->cherry_pick_in_progress = 1;
hashcpy(state->cherry_pick_head_sha1, oid.hash);
oidcpy(&state->cherry_pick_head_oid, &oid);
wt_status_check_bisect(NULL, state);
if (!stat(git_path_revert_head(), &st) &&
!get_oid("REVERT_HEAD", &oid)) {
state->revert_in_progress = 1;
hashcpy(state->revert_head_sha1, oid.hash);
oidcpy(&state->revert_head_oid, &oid);
if (get_detached_from)
......@@ -118,9 +118,9 @@ struct wt_status_state {
char *branch;
char *onto;
char *detached_from;
unsigned char detached_sha1[20];
unsigned char revert_head_sha1[20];
unsigned char cherry_pick_head_sha1[20];
struct object_id detached_oid;
struct object_id revert_head_oid;
struct object_id cherry_pick_head_oid;
size_t wt_status_locate_end(const char *s, size_t len);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment