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 /tree.c | |
parent | 23fcdc79713c47a6a0d50762b9311c9933a60d3f (diff) | |
download | git-e2ac7cb5fbcf1407003aa07cdcd14141527ea2e3.tar.gz |
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>
Diffstat (limited to 'tree.c')
-rw-r--r-- | tree.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -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); |