undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tree: convert read_tree_1 to use struct object_id internally

Browse Source 
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson 2017-05-06 22:10:15 +00:00 committed by Junio C Hamano
parent 3aca1fc6c9
commit f26efc58c8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tree.c
View File

@ -58,7 +58,7 @@ static int read_tree_1(struct tree *tree, struct strbuf *base,
{ {
struct tree_desc desc; struct tree_desc desc;
struct name_entry entry; struct name_entry entry;
unsigned char sha1[20]; struct object_id oid;
int len, oldlen = base->len; int len, oldlen = base->len;
enum interesting retval = entry_not_interesting; enum interesting retval = entry_not_interesting;
@ -87,7 +87,7 @@ static int read_tree_1(struct tree *tree, struct strbuf *base,
} }
if (S_ISDIR(entry.mode)) if (S_ISDIR(entry.mode))
hashcpy(sha1, entry.oid->hash); oidcpy(&oid, entry.oid);
else if (S_ISGITLINK(entry.mode)) { else if (S_ISGITLINK(entry.mode)) {
struct commit *commit; struct commit *commit;
@ -102,7 +102,7 @@ static int read_tree_1(struct tree *tree, struct strbuf *base,
oid_to_hex(entry.oid), oid_to_hex(entry.oid),
base->buf, entry.path); base->buf, entry.path);
hashcpy(sha1, commit->tree->object.oid.hash); oidcpy(&oid, &commit->tree->object.oid);
} }
else else
continue; continue;
@ -110,7 +110,7 @@ static int read_tree_1(struct tree *tree, struct strbuf *base,
len = tree_entry_len(&entry); len = tree_entry_len(&entry);
strbuf_add(base, entry.path, len); strbuf_add(base, entry.path, len);
strbuf_addch(base, '/'); strbuf_addch(base, '/');
retval = read_tree_1(lookup_tree(sha1), retval = read_tree_1(lookup_tree(oid.hash),
base, stage, pathspec, base, stage, pathspec,
fn, context); fn, context);
strbuf_setlen(base, oldlen); strbuf_setlen(base, oldlen);