Don't assume tree entries that are not dirs are blobs

Sam Vilain · gitster · commit e2ac7cb5fbcf · 2007-06-06T15:43:18.000-07:00
When scanning the trees in track_tree_refs() there is a "lazy" test
that assumes that entries are either directories or files.  Don't do
that.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/object.c b/object.c
@@ -160,8 +160,11 @@ struct object *parse_object_buffer(const unsigned char *sha1, enum object_type t
 		parse_tag_buffer(tag, buffer, size);
 		obj = &tag->object;
 	} else {
+		warning("object %s has unknown type id %d\n", sha1_to_hex(sha1), type);
 		obj = NULL;
 	}
+	if (obj && obj->type == OBJ_NONE)
+		obj->type = type;
 	*eaten_p = eaten;
 	return obj;
 }
diff --git a/tree.c b/tree.c
@@ -173,8 +173,13 @@ static void track_tree_refs(struct tree *item)
 			continue;
 		if (S_ISDIR(entry.mode))
 			obj = &lookup_tree(entry.sha1)->object;
-		else
+		else if (S_ISREG(entry.mode) || S_ISLNK(entry.mode))
 			obj = &lookup_blob(entry.sha1)->object;
+		else {
+			warning("in tree %s: entry %s has bad mode %.6o\n",
+			     sha1_to_hex(item->object.sha1), entry.path, entry.mode);
+			obj = lookup_unknown_object(entry.sha1);
+		}
 		refs->ref[i++] = obj;
 	}
 	set_object_refs(&item->object, refs);

Original file line number	Diff line number	Diff line change
`@@ -160,8 +160,11 @@ struct object parse_object_buffer(const unsigned char sha1, enum object_type t`
`160`	`160`	`parse_tag_buffer(tag, buffer, size);`
`161`	`161`	`obj = &tag->object;`
`162`	`162`	`} else {`
	`163`	`+ warning("object %s has unknown type id %d\n", sha1_to_hex(sha1), type);`
`163`	`164`	`obj = NULL;`
`164`	`165`	`}`
	`166`	`+ if (obj && obj->type == OBJ_NONE)`
	`167`	`+ obj->type = type;`
`165`	`168`	`*eaten_p = eaten;`
`166`	`169`	`return obj;`
`167`	`170`	`}`