diff options
author | Sam Vilain <sam.vilain@catalyst.net.nz> | 2007-06-06 22:25:17 +1200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-06-06 15:43:18 -0700 |
commit | e2ac7cb5fbcf1407003aa07cdcd14141527ea2e3 (patch) | |
tree | bcdce634d9bb7632aa6c3c7677bcf4d2209e0aa4 | |
parent | git-cvsimport: Make sure to use $git_dir always instead of .git sometimes (diff) | |
download | tgif-e2ac7cb5fbcf1407003aa07cdcd14141527ea2e3.tar.xz |
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.c | 3 | ||||
-rw-r--r-- | tree.c | 7 |
2 files changed, 9 insertions, 1 deletions
@@ -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; } @@ -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); |