summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Vilain <sam.vilain@catalyst.net.nz>2007-06-06 10:25:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-06 22:43:18 (GMT)
commite2ac7cb5fbcf1407003aa07cdcd14141527ea2e3 (patch)
treebcdce634d9bb7632aa6c3c7677bcf4d2209e0aa4
parent23fcdc79713c47a6a0d50762b9311c9933a60d3f (diff)
downloadgit-e2ac7cb5fbcf1407003aa07cdcd14141527ea2e3.zip
git-e2ac7cb5fbcf1407003aa07cdcd14141527ea2e3.tar.gz
git-e2ac7cb5fbcf1407003aa07cdcd14141527ea2e3.tar.bz2
Don't assume tree entries that are not dirs are blobs
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 <gitster@pobox.com>
-rw-r--r--object.c3
-rw-r--r--tree.c7
2 files changed, 9 insertions, 1 deletions
diff --git a/object.c b/object.c
index cfc4969..16793d9 100644
--- 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
index e4a39aa..e946dac 100644
--- 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);