summaryrefslogtreecommitdiffstats
path: root/wt-status.h
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2018-03-12 02:27:29 +0000
committerJunio C Hamano <gitster@pobox.com>2018-03-14 09:23:48 -0700
commit40f5555ca331fa7855406c674cb60b087e5dfc1a (patch)
treed41e0da659d9bf1b7a583b3d3b3cf2cd8874a23e /wt-status.h
parent30e677e0e243ebb29a5f5aeed8c850bbae9020fa (diff)
downloadgit-40f5555ca331fa7855406c674cb60b087e5dfc1a.tar.gz
git-40f5555ca331fa7855406c674cb60b087e5dfc1a.tar.xz
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.h')
-rw-r--r--wt-status.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/wt-status.h b/wt-status.h
index ea2456daf..430770b85 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -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);