Merge branch 'nd/worktree-various-heads'

diff --git a/tree-walk.h b/tree-walk.h
index 58f31f55964ef5fced978c4da8c9f19a59f58241..97a7d6957e002e854d3b93831902776c994b6208 100644 (file)
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -13,11 +13,11 @@ struct tree_desc {
        unsigned int size;
 };
 
-static inline const unsigned char *tree_entry_extract(struct tree_desc *desc, const char **pathp, unsigned int *modep)
+static inline const struct object_id *tree_entry_extract(struct tree_desc *desc, const char **pathp, unsigned int *modep)
 {
        *pathp = desc->entry.path;
        *modep = desc->entry.mode;
-       return desc->entry.oid->hash;
+       return desc->entry.oid;
 }
 
 static inline int tree_entry_len(const struct name_entry *ne)