Merge branch 'jk/prune-mtime'

diff --git a/cache-tree.c b/cache-tree.c
index feace8bd90913ff28fa7ec2d052b355ad23935ca..a59e6f1e1fcfb65bd2fe9cdba0db60d6d87e7d96 100644 (file)
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -657,7 +657,7 @@ static void prime_cache_tree_rec(struct cache_tree *it, struct tree *tree)
        struct name_entry entry;
        int cnt;
 
-       hashcpy(it->sha1, tree->object.sha1);
+       hashcpy(it->sha1, tree->object.oid.hash);
        init_tree_desc(&desc, tree->buffer, tree->size);
        cnt = 0;
        while (tree_entry(&desc, &entry)) {