summaryrefslogtreecommitdiff
path: root/worktree.h
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2017-10-15 22:07:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-10-16 02:05:51 (GMT)
commit0f05154c7064f82f122b845e0fe49a487d3a8d6e (patch)
tree865bee473a39d3e18063181ab6806d9acedc2222 /worktree.h
parenta98e6101f01b6991e780fc0b75f2937615fa84a9 (diff)
downloadgit-0f05154c7064f82f122b845e0fe49a487d3a8d6e.zip
git-0f05154c7064f82f122b845e0fe49a487d3a8d6e.tar.gz
git-0f05154c7064f82f122b845e0fe49a487d3a8d6e.tar.bz2
worktree: convert struct worktree to object_id
Convert the head_sha1 member to be head_oid instead. This is required to convert resolve_ref_unsafe. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'worktree.h')
-rw-r--r--worktree.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/worktree.h b/worktree.h
index 9276c81..c28a880 100644
--- a/worktree.h
+++ b/worktree.h
@@ -8,7 +8,7 @@ struct worktree {
char *id;
char *head_ref; /* NULL if HEAD is broken or detached */
char *lock_reason; /* internal use */
- unsigned char head_sha1[20];
+ struct object_id head_oid;
int is_detached;
int is_bare;
int is_current;