diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-03-12 02:27:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-14 16:23:48 (GMT) |
| commit | 40f5555ca331fa7855406c674cb60b087e5dfc1a (patch) | |
| tree | d41e0da659d9bf1b7a583b3d3b3cf2cd8874a23e /wt-status.c | |
| parent | 30e677e0e243ebb29a5f5aeed8c850bbae9020fa (diff) | |
| download | git-40f5555ca331fa7855406c674cb60b087e5dfc1a.zip git-40f5555ca331fa7855406c674cb60b087e5dfc1a.tar.gz git-40f5555ca331fa7855406c674cb60b087e5dfc1a.tar.bz2 | |
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 <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/wt-status.c b/wt-status.c index 5c685b6..78be89a 100644 --- a/wt-status.c +++ b/wt-status.c @@ -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); free(ref); strbuf_release(&cb.buf); @@ -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) |