fsck-cache: notice missing "blob" objects.

Linus Torvalds · Linus Torvalds · commit 4728b861ace1 · 2005-04-24T14:10:55.000-07:00
We should _not_ mark a blob object "parsed" just because we
looked it up: it gets marked that way only once we've actually
seen it. Otherwise we can never notice a missing blob.
diff --git a/blob.c b/blob.c
@@ -12,7 +12,6 @@ struct blob *lookup_blob(unsigned char *sha1)
 		memset(ret, 0, sizeof(struct blob));
 		created_object(sha1, &ret->object);
 		ret->object.type = blob_type;
-		ret->object.parsed = 1;
 		return ret;
 	}
 	if (obj->parsed && obj->type != blob_type) {
diff --git a/fsck-cache.c b/fsck-cache.c
@@ -60,11 +60,19 @@ static int fsck_commit(unsigned char *sha1, void *data, unsigned long size)
 	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_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;

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ struct blob lookup_blob(unsigned char sha1)`
`12`	`12`	`memset(ret, 0, sizeof(struct blob));`
`13`	`13`	`created_object(sha1, &ret->object);`
`14`	`14`	`ret->object.type = blob_type;`
`15`		`- ret->object.parsed = 1;`
`16`	`15`	`return ret;`
`17`	`16`	`}`
`18`	`17`	`if (obj->parsed && obj->type != blob_type) {`