X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=cache-tree.c;h=9b73c8669a0946c3bcbf1de777e9acd4cd34bcae;hb=8d9721c86b0169c282ad1c5528317eafeb7fb0f7;hp=d388848dd25db917e9bac5a8fd95cd89d214f5d8;hpb=01fe679a341ed3b1a816404faf76bf454712aa2f;p=git.git

diff --git a/cache-tree.c b/cache-tree.c
index d388848dd..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;
 	}