X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=fsck-cache.c;h=e40c64332f2ca8b01b12d1b3f050165f61836b3b;hb=8037d1a31a60e9645c56a8bebb01d0e13970b93f;hp=7c55fe56a439d4ac02c288cb99c3d7b877751322;hpb=e4bcaac17e8959eb970a348519a25d0d396395f0;p=git.git

diff --git a/fsck-cache.c b/fsck-cache.c
index 7c55fe56..e40c6433 100644
--- a/fsck-cache.c
+++ b/fsck-cache.c
@@ -6,46 +6,20 @@
 #include "tree.h"
 #include "blob.h"
 #include "tag.h"
-#include "delta.h"
+#include "refs.h"
+#include "pack.h"
 
 #define REACHABLE 0x0001
 
 static int show_root = 0;
 static int show_tags = 0;
 static int show_unreachable = 0;
-static int show_max_delta_depth = 0;
+static int standalone = 0;
+static int check_full = 0;
+static int check_strict = 0;
 static int keep_cache_objects = 0; 
 static unsigned char head_sha1[20];
 
-static void expand_deltas(void)
-{
-	int i, max_depth = 0;
-
-	/*
-	 * To be as efficient as possible we look for delta heads and
-	 * recursively process them going backward, and parsing
-	 * resulting objects along the way.  This allows for processing
-	 * each delta objects only once regardless of the delta depth.
-	 */
-	for (i = 0; i < nr_objs; i++) {
-		struct object *obj = objs[i];
-		if (obj->parsed && !obj->delta && obj->attached_deltas) {
-			int depth = 0;
-			char type[10];
-			unsigned long size;
-			void *buf = read_sha1_file(obj->sha1, type, &size);
-			if (!buf)
-				continue;
-			depth = process_deltas(buf, size, obj->type,
-					       obj->attached_deltas);
-			if (max_depth < depth)
-				max_depth = depth;
-		}
-	}
-	if (show_max_delta_depth)
-		printf("maximum delta depth = %d\n", max_depth);
-}
-															
 static void check_connectivity(void)
 {
 	int i;
@@ -56,9 +30,8 @@ static void check_connectivity(void)
 		struct object_list *refs;
 
 		if (!obj->parsed) {
-			if (obj->delta)
-				printf("unresolved delta %s\n",
-				       sha1_to_hex(obj->sha1));
+			if (!standalone && has_sha1_file(obj->sha1))
+				; /* it is in pack */
 			else
 				printf("missing %s %s\n",
 				       obj->type, sha1_to_hex(obj->sha1));
@@ -66,7 +39,8 @@ static void check_connectivity(void)
 		}
 
 		for (refs = obj->refs; refs; refs = refs->next) {
-			if (refs->item->parsed)
+			if (refs->item->parsed ||
+			    (!standalone && has_sha1_file(refs->item->sha1)))
 				continue;
 			printf("broken link from %7s %s\n",
 			       obj->type, sha1_to_hex(obj->sha1));
@@ -75,12 +49,8 @@ static void check_connectivity(void)
 		}
 
 		if (show_unreachable && !(obj->flags & REACHABLE)) {
-			if (obj->attached_deltas)
-				printf("foreign delta reference %s\n", 
-				       sha1_to_hex(obj->sha1));
-			else
-				printf("unreachable %s %s\n",
-				       obj->type, sha1_to_hex(obj->sha1));
+			printf("unreachable %s %s\n",
+			       obj->type, sha1_to_hex(obj->sha1));
 			continue;
 		}
 
@@ -139,13 +109,19 @@ static int verify_ordered(struct tree_entry_list *a, struct tree_entry_list *b)
 
 static int fsck_tree(struct tree *item)
 {
+	int retval;
 	int has_full_path = 0;
+	int has_zero_pad = 0;
+	int has_bad_modes = 0;
+	int has_dup_entries = 0;
+	int not_properly_sorted = 0;
 	struct tree_entry_list *entry, *last;
 
 	last = NULL;
 	for (entry = item->entries; entry; entry = entry->next) {
 		if (strchr(entry->name, '/'))
 			has_full_path = 1;
+		has_zero_pad |= entry->zeropad;
 
 		switch (entry->mode) {
 		/*
@@ -162,24 +138,20 @@ static int fsck_tree(struct tree *item)
 		 * bits..
 		 */
 		case S_IFREG | 0664:
-			break;
+			if (!check_strict)
+				break;
 		default:
-			printf("tree %s has entry %o %s\n",
-				sha1_to_hex(item->object.sha1),
-				entry->mode, entry->name);
+			has_bad_modes = 1;
 		}
 
 		if (last) {
 			switch (verify_ordered(last, entry)) {
 			case TREE_UNORDERED:
-				fprintf(stderr, "tree %s not ordered\n",
-					sha1_to_hex(item->object.sha1));
-				return -1;
+				not_properly_sorted = 1;
+				break;
 			case TREE_HAS_DUPS:
-				fprintf(stderr, "tree %s has duplicate entries for '%s'\n",
-					sha1_to_hex(item->object.sha1),
-					entry->name);
-				return -1;
+				has_dup_entries = 1;
+				break;
 			default:
 				break;
 			}
@@ -188,17 +160,54 @@ static int fsck_tree(struct tree *item)
 		last = entry;
 	}
 
+	retval = 0;
 	if (has_full_path) {
 		fprintf(stderr, "warning: git-fsck-cache: tree %s "
 			"has full pathnames in it\n", 
 			sha1_to_hex(item->object.sha1));
 	}
-
-	return 0;
+	if (has_zero_pad) {
+		fprintf(stderr, "warning: git-fsck-cache: tree %s "
+			"has zero-padded file modes in it\n",
+			sha1_to_hex(item->object.sha1));
+	}
+	if (has_bad_modes) {
+		fprintf(stderr, "warning: git-fsck-cache: tree %s "
+			"has bad file modes in it\n",
+			sha1_to_hex(item->object.sha1));
+	}
+	if (has_dup_entries) {
+		fprintf(stderr, "error: git-fsck-cache: tree %s "
+			"has duplicate file entries\n",
+			sha1_to_hex(item->object.sha1));
+		retval = -1;
+	}
+	if (not_properly_sorted) {
+		fprintf(stderr, "error: git-fsck-cache: tree %s "
+			"is not properly sorted\n",
+			sha1_to_hex(item->object.sha1));
+		retval = -1;
+	}
+	return retval;
 }
 
 static int fsck_commit(struct commit *commit)
 {
+	char *buffer = commit->buffer;
+	unsigned char sha1[20];
+
+	if (memcmp(buffer, "tree ", 5))
+		return -1;
+	if (get_sha1_hex(buffer+5, sha1) || buffer[45] != '\n')
+		return -1;
+	buffer += 46;
+	while (!memcmp(buffer, "parent ", 7)) {
+		if (get_sha1_hex(buffer+7, sha1) || buffer[47] != '\n')
+			return -1;
+		buffer += 48;
+	}
+	if (memcmp(buffer, "author ", 7))
+		return -1;
 	free(commit->buffer);
 	commit->buffer = NULL;
 	if (!commit->tree)
@@ -240,8 +249,6 @@ static int fsck_sha1(unsigned char *sha1)
 		return fsck_commit((struct commit *) obj);
 	if (obj->type == tag_type)
 		return fsck_tag((struct tag *) obj);
-	if (!obj->type && obj->delta)
-		return 0;
 	return -1;
 }
 
@@ -337,80 +344,74 @@ static int fsck_dir(int i, char *path)
 	return 0;
 }
 
-static int read_sha1_reference(const char *path)
+static int default_refs = 0;
+
+static int fsck_handle_ref(const char *refname, const unsigned char *sha1)
 {
-	char hexname[60];
-	unsigned char sha1[20];
-	int fd = open(path, O_RDONLY), len;
 	struct object *obj;
 
-	if (fd < 0)
-		return -1;
-
-	len = read(fd, hexname, sizeof(hexname));
-	close(fd);
-	if (len < 40)
-		return -1;
-
-	if (get_sha1_hex(hexname, sha1) < 0)
-		return -1;
-
 	obj = lookup_object(sha1);
-	if (!obj)
-		return error("%s: invalid sha1 pointer %.40s", path, hexname);
-
+	if (!obj) {
+		if (!standalone && has_sha1_file(sha1)) {
+			default_refs++;
+			return 0; /* it is in a pack */
+		}
+		error("%s: invalid sha1 pointer %s", refname, sha1_to_hex(sha1));
+		/* We'll continue with the rest despite the error.. */
+		return 0;
+	}
+	default_refs++;
 	obj->used = 1;
 	mark_reachable(obj, REACHABLE);
 	return 0;
 }
 
-static int find_file_objects(const char *base, const char *name)
+static void get_default_heads(void)
 {
-	int baselen = strlen(base);
-	int namelen = strlen(name);
-	char *path = xmalloc(baselen + namelen + 2);
-	struct stat st;
-
-	memcpy(path, base, baselen);
-	path[baselen] = '/';
-	memcpy(path + baselen + 1, name, namelen+1);
-	if (stat(path, &st) < 0)
-		return 0;
+	for_each_ref(fsck_handle_ref);
+	if (!default_refs)
+		die("No default references");
+}
 
-	/*
-	 * Recurse into directories
-	 */
-	if (S_ISDIR(st.st_mode)) {
-		int count = 0;
-		DIR *dir = opendir(path);
-		if (dir) {
-			struct dirent *de;
-			while ((de = readdir(dir)) != NULL) {
-				if (de->d_name[0] == '.')
-					continue;
-				count += find_file_objects(path, de->d_name);
-			}
-			closedir(dir);
-		}
-		return count;
+static void fsck_object_dir(const char *path)
+{
+	int i;
+	for (i = 0; i < 256; i++) {
+		static char dir[4096];
+		sprintf(dir, "%s/%02x", path, i);
+		fsck_dir(i, dir);
 	}
-	if (S_ISREG(st.st_mode))
-		return read_sha1_reference(path) == 0;
-	return 0;
+	fsck_sha1_list();
 }
 
-static void get_default_heads(void)
+static int fsck_head_link(void)
 {
-	char *git_dir = gitenv(GIT_DIR_ENVIRONMENT) ? : DEFAULT_GIT_DIR_ENVIRONMENT;
-	int count = find_file_objects(git_dir, "refs");
-	if (!count)
-		die("No default references");
+	int fd, count;
+	char hex[40];
+	unsigned char sha1[20];
+	static char path[PATH_MAX], link[PATH_MAX];
+	const char *git_dir = gitenv(GIT_DIR_ENVIRONMENT) ? : DEFAULT_GIT_DIR_ENVIRONMENT;
+
+	snprintf(path, sizeof(path), "%s/HEAD", git_dir);
+	if (readlink(path, link, sizeof(link)) < 0)
+		return error("HEAD is not a symlink");
+	if (strncmp("refs/heads/", link, 11))
+		return error("HEAD points to something strange (%s)", link);
+	fd = open(path, O_RDONLY);
+	if (fd < 0)
+		return error("HEAD: %s", strerror(errno));
+	count = read(fd, hex, sizeof(hex));
+	close(fd);
+	if (count < 0)
+		return error("HEAD: %s", strerror(errno));
+	if (count < 40 || get_sha1_hex(hex, sha1))
+		return error("HEAD: not a valid git pointer");
+	return 0;
 }
 
 int main(int argc, char **argv)
 {
 	int i, heads;
-	char *sha1_dir;
 
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];
@@ -427,27 +428,60 @@ int main(int argc, char **argv)
 			show_root = 1;
 			continue;
 		}
-		if (!strcmp(arg, "--delta-depth")) {
-			show_max_delta_depth = 1;
-			continue;
-		}
 		if (!strcmp(arg, "--cache")) {
 			keep_cache_objects = 1;
 			continue;
 		}
+		if (!strcmp(arg, "--standalone")) {
+			standalone = 1;
+			continue;
+		}
+		if (!strcmp(arg, "--full")) {
+			check_full = 1;
+			continue;
+		}
+		if (!strcmp(arg, "--strict")) {
+			check_strict = 1;
+			continue;
+		}
 		if (*arg == '-')
-			usage("git-fsck-cache [--tags] [[--unreachable] [--cache] <head-sha1>*]");
+			usage("git-fsck-cache [--tags] [--root] [[--unreachable] [--cache] [--standalone | --full] [--strict] <head-sha1>*]");
 	}
 
-	sha1_dir = get_object_directory();
-	for (i = 0; i < 256; i++) {
-		static char dir[4096];
-		sprintf(dir, "%s/%02x", sha1_dir, i);
-		fsck_dir(i, dir);
-	}
-	fsck_sha1_list();
+	if (standalone && check_full)
+		die("Only one of --standalone or --full can be used.");
+	if (standalone)
+		unsetenv("GIT_ALTERNATE_OBJECT_DIRECTORIES");
+
+	fsck_head_link();
+	fsck_object_dir(get_object_directory());
+	if (check_full) {
+		int j;
+		struct packed_git *p;
+		prepare_alt_odb();
+		for (j = 0; alt_odb[j].base; j++) {
+			char namebuf[PATH_MAX];
+			int namelen = alt_odb[j].name - alt_odb[j].base;
+			memcpy(namebuf, alt_odb[j].base, namelen);
+			namebuf[namelen - 1] = 0;
+			fsck_object_dir(namebuf);
+		}
+		prepare_packed_git();
+		for (p = packed_git; p; p = p->next)
+			/* verify gives error messages itself */
+			verify_pack(p, 0);
+
+		for (p = packed_git; p; p = p->next) {
+			int num = num_packed_objects(p);
+			for (i = 0; i < num; i++) {
+				unsigned char sha1[20];
+				nth_packed_object_sha1(p, i, sha1);
+				if (fsck_sha1(sha1) < 0)
+					fprintf(stderr, "bad sha1 entry '%s'\n", sha1_to_hex(sha1));
 
-	expand_deltas();
+			}
+		}
+	}
 
 	heads = 0;
 	for (i = 1; i < argc; i++) {