X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=fsck-cache.c;h=164fc2eaeeac42a5bbec45845d852da8104e2459;hb=b6829693676c882ecb0d8ebc0a3a083e5e38131e;hp=e3c41d48e9fe3e298a8dc3f2b2ecc2a71f6629e8;hpb=e6948b6d88c69a864e9c461911287c5cc5932a3b;p=git.git

diff --git a/fsck-cache.c b/fsck-cache.c
index e3c41d48..164fc2ea 100644
--- a/fsck-cache.c
+++ b/fsck-cache.c
@@ -6,9 +6,12 @@
 #include "commit.h"
 #include "tree.h"
 #include "blob.h"
+#include "tag.h"
 
 #define REACHABLE 0x0001
 
+static int show_root = 0;
+static int show_tags = 0;
 static int show_unreachable = 0;
 static unsigned char head_sha1[20];
 
@@ -19,6 +22,7 @@ static void check_connectivity(void)
 	/* Look up all the requirements, warn about missing objects.. */
 	for (i = 0; i < nr_objs; i++) {
 		struct object *obj = objs[i];
+		struct object_list *refs;
 
 		if (show_unreachable && !(obj->flags & REACHABLE)) {
 			printf("unreachable %s %s\n", obj->type, sha1_to_hex(obj->sha1));
@@ -33,56 +37,49 @@ static void check_connectivity(void)
 			printf("dangling %s %s\n", obj->type, 
 			       sha1_to_hex(obj->sha1));
 		}
+		for (refs = obj->refs; refs; refs = refs->next) {
+			if (!refs->item->parsed) {
+				printf("broken link from %s\n",
+				       sha1_to_hex(obj->sha1));
+				printf("              to %s\n",
+				       sha1_to_hex(refs->item->sha1));
+			}
+		}
 	}
 }
 
-static int fsck_tree(unsigned char *sha1, void *data, unsigned long size)
+static int fsck_tree(struct tree *item)
 {
-	struct tree *item = lookup_tree(sha1);
-	if (parse_tree(item))
-		return -1;
 	if (item->has_full_path) {
 		fprintf(stderr, "warning: fsck-cache: tree %s "
-			"has full pathnames in it\n", sha1_to_hex(sha1));
+			"has full pathnames in it\n", 
+			sha1_to_hex(item->object.sha1));
 	}
 	return 0;
 }
 
-static int fsck_commit(unsigned char *sha1, void *data, unsigned long size)
+static int fsck_commit(struct commit *commit)
 {
-	struct commit *commit = lookup_commit(sha1);
-	if (parse_commit(commit))
-		return -1;
 	if (!commit->tree)
 		return -1;
-	if (!commit->parents)
-		printf("root %s\n", sha1_to_hex(sha1));
+	if (!commit->parents && show_root)
+		printf("root %s\n", sha1_to_hex(commit->object.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;
+		printf("bad commit date in %s\n", 
+		       sha1_to_hex(commit->object.sha1));
 	return 0;
 }
 
-static int fsck_entry(unsigned char *sha1, char *tag, void *data, 
-		      unsigned long size)
+static int fsck_tag(struct tag *tag)
 {
-	if (!strcmp(tag, "blob")) {
-		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
-		return -1;
+	if (!show_tags)
+		return 0;
+
+	printf("tagged %s %s",
+	       tag->tagged->type,
+	       sha1_to_hex(tag->tagged->sha1));
+	printf(" (%s) in %s\n",
+	       tag->tag, sha1_to_hex(tag->object.sha1));
 	return 0;
 }
 
@@ -90,20 +87,17 @@ static int fsck_name(char *hex)
 {
 	unsigned char sha1[20];
 	if (!get_sha1_hex(hex, sha1)) {
-		unsigned long mapsize;
-		void *map = map_sha1_file(sha1, &mapsize);
-		if (map) {
-			char type[100];
-			unsigned long 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 (!fsck_entry(sha1, type, buffer, size))
-				return 0;
-		}
+		struct object *obj = parse_object(sha1);
+		if (!obj)
+			return -1;
+		if (obj->type == blob_type)
+			return 0;
+		if (obj->type == tree_type)
+			return fsck_tree((struct tree *) obj);
+		if (obj->type == commit_type)
+			return fsck_commit((struct commit *) obj);
+		if (obj->type == tag_type)
+			return fsck_tag((struct tag *) obj);
 	}
 	return -1;
 }
@@ -146,6 +140,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];
@@ -155,18 +168,26 @@ 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)) {
-			struct object *obj = &lookup_commit(head_sha1)->object;
+
+		if (!get_sha1_hex(arg, head_sha1)) {
+			struct commit *commit = lookup_commit(head_sha1);
+			struct object *obj;
+
+			/* Error is printed by lookup_commit(). */
+			if (!commit)
+				continue;
+
+			obj = &commit->object;
 			obj->used = 1;
 			mark_reachable(obj, REACHABLE);
 			heads++;
 			continue;
 		}
-		error("fsck-cache [[--unreachable] <head-sha1>*]");
+		error("expected sha1, got %s", arg);
 	}
 
 	if (!heads) {