X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=tree.c;h=96f78f6a3407ee86ab73de736e0485614017cb92;hb=042a4ed7c51f909fa53a8fa2f1024a1938812f27;hp=aa55ddb6846bdc33abf9d41424d105e1b2331640;hpb=6af1f0192ff8740fe77db7cf02c739ccfbdf119c;p=git.git

diff --git a/tree.c b/tree.c
index aa55ddb6..96f78f6a 100644
--- a/tree.c
+++ b/tree.c
@@ -18,7 +18,7 @@ static int read_one_entry(unsigned char *sha1, const char *base, int baselen, co
 	memcpy(ce->name, base, baselen);
 	memcpy(ce->name + baselen, pathname, len+1);
 	memcpy(ce->sha1, sha1, 20);
-	return add_cache_entry(ce, ADD_CACHE_OK_TO_ADD);
+	return add_cache_entry(ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_SKIP_DFCHECK);
 }
 
 static int read_tree_recursive(void *buffer, unsigned long size,
@@ -73,7 +73,7 @@ int read_tree(void *buffer, unsigned long size, int stage)
 	return read_tree_recursive(buffer, size, "", 0, stage);
 }
 
-struct tree *lookup_tree(unsigned char *sha1)
+struct tree *lookup_tree(const unsigned char *sha1)
 {
 	struct object *obj = lookup_object(sha1);
 	if (!obj) {