X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=fsck-cache.c;h=1123b6b7e4312a9ab47071479d071a5856fc8134;hb=f768846e34997fb847c9b875615867d4716d632f;hp=0a97566e87480b4e839c692d5d3a405b0cf3643b;hpb=1ea34e365b1ea233be332245bc34a8df415a7d61;p=git.git

diff --git a/fsck-cache.c b/fsck-cache.c
index 0a97566e..1123b6b7 100644
--- a/fsck-cache.c
+++ b/fsck-cache.c
@@ -24,16 +24,19 @@ 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;
 }
 
 static int fsck_commit(unsigned char *sha1, void *data, unsigned long size)
 {
+	int parents;
 	unsigned char tree_sha1[20];
 	unsigned char parent_sha1[20];
 
@@ -43,12 +46,17 @@ static int fsck_commit(unsigned char *sha1, void *data, unsigned long size)
 		return -1;
 	mark_needs_sha1(sha1, "tree", tree_sha1);
 	data += 5 + 40 + 1;	/* "tree " + <hex sha1> + '\n' */
+	parents = 0;
 	while (!memcmp(data, "parent ", 7)) {
 		if (get_sha1_hex(data + 7, parent_sha1) < 0)
 			return -1;
 		mark_needs_sha1(sha1, "commit", parent_sha1);
 		data += 7 + 40 + 1; 	/* "parent " + <hex sha1> + '\n' */
+		parents++;
 	}
+	if (!parents)
+		printf("root: %s\n", sha1_to_hex(sha1));
+	return 0;
 }
 
 static int fsck_entry(unsigned char *sha1, char *tag, void *data, unsigned long size)