summaryrefslogtreecommitdiffstats
path: root/walker.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2016-04-18 01:10:39 +0200
committerJunio C Hamano <gitster@pobox.com>2016-04-25 23:23:42 +0200
commit7d924c9139e33e7599d7aed0446e634c427a5f15 (patch)
tree61d1667fff3d183398d5223d86805ec44264a518 /walker.c
parentmatch-trees: convert shift_tree() and shift_tree_by() to use object_id (diff)
downloadgit-7d924c9139e33e7599d7aed0446e634c427a5f15.tar.xz
git-7d924c9139e33e7599d7aed0446e634c427a5f15.zip
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 'walker.c')
-rw-r--r--walker.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/walker.c b/walker.c
index 08773d419f..d95b007294 100644
--- a/walker.c
+++ b/walker.c
@@ -43,12 +43,12 @@ static int process_tree(struct walker *walker, struct tree *tree)
if (S_ISGITLINK(entry.mode))
continue;
if (S_ISDIR(entry.mode)) {
- struct tree *tree = lookup_tree(entry.sha1);
+ struct tree *tree = lookup_tree(entry.oid->hash);
if (tree)
obj = &tree->object;
}
else {
- struct blob *blob = lookup_blob(entry.sha1);
+ struct blob *blob = lookup_blob(entry.oid->hash);
if (blob)
obj = &blob->object;
}