X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=cache-tree.c;h=9b73c8669a0946c3bcbf1de777e9acd4cd34bcae;hb=e861ce1692fa9809f3e7b898804f8ddaf7cd8975;hp=323c68a6709f30312e0dfb0fd60fcd7e69cd710b;hpb=551029af305e04bed638771a3932e376243dddcb;p=git.git

diff --git a/cache-tree.c b/cache-tree.c
index 323c68a67..9b73c8669 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -2,7 +2,9 @@
 #include "tree.h"
 #include "cache-tree.h"
 
+#ifndef DEBUG
 #define DEBUG 0
+#endif
 
 struct cache_tree *cache_tree(void)
 {
@@ -280,6 +282,8 @@ static int update_one(struct cache_tree *it,
 				    baselen + sublen + 1,
 				    missing_ok,
 				    dryrun);
+		if (subcnt < 0)
+			return subcnt;
 		i += subcnt - 1;
 		sub->used = 1;
 	}
@@ -344,12 +348,8 @@ static int update_one(struct cache_tree *it,
 #endif
 	}
 
-	if (dryrun) {
-		unsigned char hdr[200];
-		int hdrlen;
-		write_sha1_file_prepare(buffer, offset, tree_type, it->sha1,
-					hdr, &hdrlen);
-	}
+	if (dryrun)
+		hash_sha1_file(buffer, offset, tree_type, it->sha1);
 	else
 		write_sha1_file(buffer, offset, tree_type, it->sha1);
 	free(buffer);