Teach "fsck" and "read-tree" about recursive tree-nodes.

diff --git a/fsck-cache.c b/fsck-cache.c
index ac348b7d5278e9d04e3a1cd417389379c32b014f..1123b6b7e4312a9ab47071479d071a5856fc8134 100644 (file)
--- a/fsck-cache.c
+++ b/fsck-cache.c
@@ -24,11 +24,12 @@ static int fsck_tree(unsigned char *sha1, void *data, unsigned long size)
                int len = 1+strlen(data);
                unsigned char *file_sha1 = data + len;
                char *path = strchr(data, ' ');
-               if (size < len + 20 || !path)
+               unsigned int mode;
+               if (size < len + 20 || !path || sscanf(data, "%o", &mode) != 1)
                        return -1;
                data += len + 20;
                size -= len + 20;
-               mark_needs_sha1(sha1, "blob", file_sha1);
+               mark_needs_sha1(sha1, S_ISDIR(mode) ? "tree" : "blob", file_sha1);
        }
        return 0;
 }