X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=fsck-cache.c;h=f9b1431dd8f4f3b426a7e410de952277aaa11401;hb=812666c8e66a21e668c0789d0422aa5a7db54961;hp=edaf9e46000197de66b2afb98a01358375b92e37;hpb=b51ad4314078298194d23d46e2b4473ffd32a88a;p=git.git

diff --git a/fsck-cache.c b/fsck-cache.c
index edaf9e46..f9b1431d 100644
--- a/fsck-cache.c
+++ b/fsck-cache.c
@@ -9,6 +9,8 @@
 
 #define REACHABLE 0x0001
 
+static int show_root = 0;
+static int show_tags = 0;
 static int show_unreachable = 0;
 static unsigned char head_sha1[20];
 
@@ -21,7 +23,7 @@ static void check_connectivity(void)
 		struct object *obj = objs[i];
 
 		if (show_unreachable && !(obj->flags & REACHABLE)) {
-			printf("unreachable %s\n", sha1_to_hex(obj->sha1));
+			printf("unreachable %s %s\n", obj->type, sha1_to_hex(obj->sha1));
 			continue;
 		}
 
@@ -55,8 +57,59 @@ static int fsck_commit(unsigned char *sha1, void *data, unsigned long size)
 		return -1;
 	if (!commit->tree)
 		return -1;
-	if (!commit->parents)
+	if (!commit->parents && show_root)
 		printf("root %s\n", sha1_to_hex(sha1));
+	if (!commit->date)
+		printf("bad commit date in %s\n", sha1_to_hex(sha1));
+	return 0;
+}
+
+static int fsck_blob(unsigned char *sha1, void *data, unsigned long size)
+{
+	struct blob *blob = lookup_blob(sha1);
+	blob->object.parsed = 1;
+	return 0;
+}
+
+static int fsck_tag(unsigned char *sha1, void *data, unsigned long size)
+{
+	int typelen, taglen;
+	unsigned char object[20];
+	char object_hex[60];
+	const char *type_line, *tag_line, *sig_line;
+
+	if (size < 64)
+		return -1;
+	if (memcmp("object ", data, 7) || get_sha1_hex(data + 7, object))
+		return -1;
+
+	type_line = data + 48;
+	if (memcmp("\ntype ", type_line-1, 6))
+		return -1;
+
+	tag_line = strchr(type_line, '\n');
+	if (!tag_line || memcmp("tag ", ++tag_line, 4))
+		return -1;
+
+	sig_line = strchr(tag_line, '\n');
+	if (!sig_line)
+		return -1;
+	sig_line++;
+
+	typelen = tag_line - type_line - strlen("type \n");
+	if (typelen >= 20)
+		return -1;
+	taglen = sig_line - tag_line - strlen("tag \n");
+
+	if (!show_tags)
+		return 0;
+
+	strcpy(object_hex, sha1_to_hex(object));
+	printf("tagged %.*s %s (%.*s) in %s\n",
+		typelen, type_line + 5,
+		object_hex,
+		taglen, tag_line + 4,
+		sha1_to_hex(sha1));
 	return 0;
 }
 
@@ -64,13 +117,17 @@ static int fsck_entry(unsigned char *sha1, char *tag, void *data,
 		      unsigned long size)
 {
 	if (!strcmp(tag, "blob")) {
-		lookup_blob(sha1); /* Nothing to check; but notice it. */
+		if (fsck_blob(sha1, data, size) < 0)
+			return -1;
 	} else if (!strcmp(tag, "tree")) {
 		if (fsck_tree(sha1, data, size) < 0)
 			return -1;
 	} else if (!strcmp(tag, "commit")) {
 		if (fsck_commit(sha1, data, size) < 0)
 			return -1;
+	} else if (!strcmp(tag, "tag")) {
+		if (fsck_tag(sha1, data, size) < 0)
+			return -1;
 	} else
 		return -1;
 	return 0;
@@ -85,12 +142,13 @@ static int fsck_name(char *hex)
 		if (map) {
 			char type[100];
 			unsigned long size;
-			void *buffer = NULL;
-			if (!check_sha1_signature(sha1, map, mapsize))
-				buffer = unpack_sha1_file(map, mapsize, type,
-							  &size);
+			void *buffer = unpack_sha1_file(map, mapsize, type, &size);
+			if (!buffer)
+				return -1;
+			if (check_sha1_signature(sha1, buffer, size, type) < 0)
+				printf("sha1 mismatch %s\n", sha1_to_hex(sha1));
 			munmap(map, mapsize);
-			if (buffer && !fsck_entry(sha1, type, buffer, size))
+			if (!fsck_entry(sha1, type, buffer, size))
 				return 0;
 		}
 	}
@@ -135,6 +193,25 @@ int main(int argc, char **argv)
 	int i, heads;
 	char *sha1_dir;
 
+	for (i = 1; i < argc; i++) {
+		const char *arg = argv[i];
+
+		if (!strcmp(arg, "--unreachable")) {
+			show_unreachable = 1;
+			continue;
+		}
+		if (!strcmp(arg, "--tags")) {
+			show_tags = 1;
+			continue;
+		}
+		if (!strcmp(arg, "--root")) {
+			show_root = 1;
+			continue;
+		}
+		if (*arg == '-')
+			usage("fsck-cache [--tags] [[--unreachable] <head-sha1>*]");
+	}
+
 	sha1_dir = getenv(DB_ENVIRONMENT) ? : DEFAULT_DB_ENVIRONMENT;
 	for (i = 0; i < 256; i++) {
 		static char dir[4096];
@@ -144,18 +221,19 @@ int main(int argc, char **argv)
 
 	heads = 0;
 	for (i = 1; i < argc; i++) {
-		if (!strcmp(argv[i], "--unreachable")) {
-			show_unreachable = 1;
+		const char *arg = argv[i]; 
+
+		if (*arg == '-')
 			continue;
-		}
-		if (!get_sha1_hex(argv[i], head_sha1)) {
+
+		if (!get_sha1_hex(arg, head_sha1)) {
 			struct object *obj = &lookup_commit(head_sha1)->object;
 			obj->used = 1;
 			mark_reachable(obj, REACHABLE);
 			heads++;
 			continue;
 		}
-		error("fsck-cache [[--unreachable] <head-sha1>*]");
+		error("expected sha1, got %s", arg);
 	}
 
 	if (!heads) {