Merge branch 'lb/rebase-i-short-command-names'

diff --git a/worktree.h b/worktree.h
index 9276c81ae7cb5c42a86fd9ebbdb28720be409e47..c28a880e1839ef26604d80de78eb9c663a6be381 100644 (file)
--- 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;