X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=fsck-cache.c;h=916792417d55b16124f2c352bfc1efcb8461ebc0;hb=a9174a14fcdac48b23e43db83649847a931fb1d8;hp=d2aff8c64380f5655ea14de9f6f6e4ce468e525a;hpb=1024932f019905ff1a9e06e5acbee441919d4d05;p=git.git

diff --git a/fsck-cache.c b/fsck-cache.c
index d2aff8c6..91679241 100644
--- a/fsck-cache.c
+++ b/fsck-cache.c
@@ -25,7 +25,8 @@ static void check_connectivity(void)
 		struct object_list *refs;
 
 		if (!obj->parsed) {
-			printf("missing %s %s\n", obj->type, sha1_to_hex(obj->sha1));
+			printf("missing %s %s\n",
+			       obj->type, sha1_to_hex(obj->sha1));
 			continue;
 		}
 
@@ -38,12 +39,9 @@ static void check_connectivity(void)
 			       refs->item->type, sha1_to_hex(refs->item->sha1));
 		}
 
-		/* Don't bother with tag reachability. */
-		if (obj->type == tag_type)
-			continue;
-
 		if (show_unreachable && !(obj->flags & REACHABLE)) {
-			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;
 		}
 
@@ -152,7 +150,7 @@ static int fsck_tree(struct tree *item)
 	}
 
 	if (has_full_path) {
-		fprintf(stderr, "warning: fsck-cache: tree %s "
+		fprintf(stderr, "warning: git-fsck-cache: tree %s "
 			"has full pathnames in it\n", 
 			sha1_to_hex(item->object.sha1));
 	}
@@ -162,6 +160,8 @@ static int fsck_tree(struct tree *item)
 
 static int fsck_commit(struct commit *commit)
 {
+	free(commit->buffer);
+	commit->buffer = NULL;
 	if (!commit->tree)
 		return -1;
 	if (!commit->parents && show_root)
@@ -296,7 +296,7 @@ static int fsck_dir(int i, char *path)
 	return 0;
 }
 
-static void read_sha1_reference(const char *path)
+static int read_sha1_reference(const char *path)
 {
 	char hexname[60];
 	unsigned char sha1[20];
@@ -304,22 +304,26 @@ static void read_sha1_reference(const char *path)
 	struct object *obj;
 
 	if (fd < 0)
-		return;
+		return -1;
 
 	len = read(fd, hexname, sizeof(hexname));
 	close(fd);
 	if (len < 40)
-		return;
+		return -1;
 
 	if (get_sha1_hex(hexname, sha1) < 0)
-		return;
+		return -1;
 
 	obj = lookup_object(sha1);
+	if (!obj)
+		return error("%s: invalid sha1 pointer %.40s", path, hexname);
+
 	obj->used = 1;
 	mark_reachable(obj, REACHABLE);
+	return 0;
 }
 
-static void find_file_objects(const char *base, const char *name)
+static int find_file_objects(const char *base, const char *name)
 {
 	int baselen = strlen(base);
 	int namelen = strlen(name);
@@ -330,34 +334,36 @@ static void find_file_objects(const char *base, const char *name)
 	path[baselen] = '/';
 	memcpy(path + baselen + 1, name, namelen+1);
 	if (stat(path, &st) < 0)
-		return;
+		return 0;
 
 	/*
 	 * 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;
-				find_file_objects(path, de->d_name);
+				count += find_file_objects(path, de->d_name);
 			}
 			closedir(dir);
 		}
-		return;
-	}
-	if (S_ISREG(st.st_mode)) {
-		read_sha1_reference(path);
-		return;
+		return count;
 	}
+	if (S_ISREG(st.st_mode))
+		return read_sha1_reference(path) == 0;
+	return 0;
 }
 
 static void get_default_heads(void)
 {
 	char *git_dir = gitenv(GIT_DIR_ENVIRONMENT) ? : DEFAULT_GIT_DIR_ENVIRONMENT;
-	find_file_objects(git_dir, "refs");
+	int count = find_file_objects(git_dir, "refs");
+	if (!count)
+		die("No default references");
 }
 
 int main(int argc, char **argv)
@@ -385,7 +391,7 @@ int main(int argc, char **argv)
 			continue;
 		}
 		if (*arg == '-')
-			usage("fsck-cache [--tags] [[--unreachable] [--cache] <head-sha1>*]");
+			usage("git-fsck-cache [--tags] [[--unreachable] [--cache] <head-sha1>*]");
 	}
 
 	sha1_dir = get_object_directory();
@@ -419,11 +425,11 @@ int main(int argc, char **argv)
 	}
 
 	/*
-	 * If we've been asked to do reachability without any explicit
-	 * head information, do the default ones from .git/refs. We also
-	 * consider the index file in this case (ie this implies --cache).
+	 * If we've not been given any explicit head information, do the
+	 * default ones from .git/refs. We also consider the index file
+	 * in this case (ie this implies --cache).
 	 */
-	if (show_unreachable && !heads) {
+	if (!heads) {
 		get_default_heads();
 		keep_cache_objects = 1;
 	}