Merge branch 'it/log-format-source'

diff --git a/tree-walk.h b/tree-walk.h
index eefd26bb6214916f7c451d97710b5ee443e52088..a4ad28ea5e62926b3450a4c7b093c9aa811107cd 100644 (file)
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -1,12 +1,12 @@
 #ifndef TREE_WALK_H
 #define TREE_WALK_H
 
-struct index_state;
-struct strbuf;
+#include "cache.h"
 
 struct name_entry {
-       const struct object_id *oid;
+       struct object_id oid;
        const char *path;
+       int pathlen;
        unsigned int mode;
 };
 
@@ -20,12 +20,12 @@ static inline const struct object_id *tree_entry_extract(struct tree_desc *desc,
 {
        *pathp = desc->entry.path;
        *modep = desc->entry.mode;
-       return desc->entry.oid;
+       return &desc->entry.oid;
 }
 
 static inline int tree_entry_len(const struct name_entry *ne)
 {
-       return (const char *)ne->oid - ne->path - 1;
+       return ne->pathlen;
 }
 
 /*