diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2016-04-17 23:10:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-25 21:23:42 (GMT) |
| commit | 7d924c9139e33e7599d7aed0446e634c427a5f15 (patch) | |
| tree | 61d1667fff3d183398d5223d86805ec44264a518 /cache-tree.c | |
| parent | 82db3d44e7a9d9219dd8e19607026bae9e435012 (diff) | |
| download | git-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 'cache-tree.c')
| -rw-r--r-- | cache-tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cache-tree.c b/cache-tree.c index 3ebf9c3..ddf0cc9 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -663,7 +663,7 @@ static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree) cnt++; else { struct cache_tree_sub *sub; - struct tree *subtree = lookup_tree(entry.sha1); + struct tree *subtree = lookup_tree(entry.oid->hash); if (!subtree->object.parsed) parse_tree(subtree); sub = cache_tree_sub(it, entry.path); @@ -710,7 +710,7 @@ int cache_tree_matches_traversal(struct cache_tree *root, it = find_cache_tree_from_traversal(root, info); it = cache_tree_find(it, ent->path); - if (it && it->entry_count > 0 && !hashcmp(ent->sha1, it->sha1)) + if (it && it->entry_count > 0 && !hashcmp(ent->oid->hash, it->sha1)) return it->entry_count; return 0; } |