struct name_entry: use struct object_id instead of unsigned char sha1[20]
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
82db3d44e7
commit
7d924c9139
@ -438,7 +438,7 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
|
||||
strbuf_add(base, entry.path, te_len);
|
||||
|
||||
if (S_ISREG(entry.mode)) {
|
||||
hit |= grep_sha1(opt, entry.sha1, base->buf, tn_len,
|
||||
hit |= grep_sha1(opt, entry.oid->hash, base->buf, tn_len,
|
||||
check_attr ? base->buf + tn_len : NULL);
|
||||
}
|
||||
else if (S_ISDIR(entry.mode)) {
|
||||
@ -447,10 +447,10 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
|
||||
void *data;
|
||||
unsigned long size;
|
||||
|
||||
data = lock_and_read_sha1_file(entry.sha1, &type, &size);
|
||||
data = lock_and_read_sha1_file(entry.oid->hash, &type, &size);
|
||||
if (!data)
|
||||
die(_("unable to read tree (%s)"),
|
||||
sha1_to_hex(entry.sha1));
|
||||
oid_to_hex(entry.oid));
|
||||
|
||||
strbuf_addch(base, '/');
|
||||
init_tree_desc(&sub, data, size);
|
||||
|
Reference in New Issue
Block a user