diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-03-12 02:27:30 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-14 16:23:48 (GMT) |
| commit | aab9583f7b5ea5463eb3f653a0b4ecac7539dc94 (patch) | |
| tree | 8a35067c58e60715b459d7c2e44bbae71344d657 /wt-status.c | |
| parent | 40f5555ca331fa7855406c674cb60b087e5dfc1a (diff) | |
| download | git-aab9583f7b5ea5463eb3f653a0b4ecac7539dc94.zip git-aab9583f7b5ea5463eb3f653a0b4ecac7539dc94.tar.gz git-aab9583f7b5ea5463eb3f653a0b4ecac7539dc94.tar.bz2 | |
Convert find_unique_abbrev* to struct object_id
Convert find_unique_abbrev and find_unique_abbrev_r to each take a
pointer to struct object_id.
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wt-status.c b/wt-status.c index 78be89a..50815e5 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_oid.hash, DEFAULT_ABBREV)); + find_unique_abbrev(&state->cherry_pick_head_oid, 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_oid.hash, DEFAULT_ABBREV)); + find_unique_abbrev(&state->revert_head_oid, DEFAULT_ABBREV)); if (s->hints) { if (has_unmerged(s)) status_printf_ln(s, color, @@ -1489,7 +1489,7 @@ static void wt_status_get_detached_from(struct wt_status_state *state) state->detached_from = xstrdup(from); } else state->detached_from = - xstrdup(find_unique_abbrev(cb.noid.hash, DEFAULT_ABBREV)); + xstrdup(find_unique_abbrev(&cb.noid, DEFAULT_ABBREV)); oidcpy(&state->detached_oid, &cb.noid); state->detached_at = !get_oid("HEAD", &oid) && !oidcmp(&oid, &state->detached_oid); |