summaryrefslogtreecommitdiff
path: root/tree-walk.h
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2016-04-17 23:10:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-25 21:23:42 (GMT)
commit7d924c9139e33e7599d7aed0446e634c427a5f15 (patch)
tree61d1667fff3d183398d5223d86805ec44264a518 /tree-walk.h
parent82db3d44e7a9d9219dd8e19607026bae9e435012 (diff)
downloadgit-7d924c9139e33e7599d7aed0446e634c427a5f15.zip
git-7d924c9139e33e7599d7aed0446e634c427a5f15.tar.gz
git-7d924c9139e33e7599d7aed0446e634c427a5f15.tar.bz2
struct name_entry: use struct object_id instead of unsigned char sha1[20]
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'tree-walk.h')
-rw-r--r--tree-walk.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/tree-walk.h b/tree-walk.h
index 174eb61..58f31f5 100644
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -2,7 +2,7 @@
#define TREE_WALK_H
struct name_entry {
- const unsigned char *sha1;
+ const struct object_id *oid;
const char *path;
unsigned int mode;
};
@@ -17,12 +17,12 @@ static inline const unsigned char *tree_entry_extract(struct tree_desc *desc, co
{
*pathp = desc->entry.path;
*modep = desc->entry.mode;
- return desc->entry.sha1;
+ return desc->entry.oid->hash;
}
static inline int tree_entry_len(const struct name_entry *ne)
{
- return (const char *)ne->sha1 - ne->path - 1;
+ return (const char *)ne->oid - ne->path - 1;
}
void update_tree_entry(struct tree_desc *);