diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2016-04-17 23:10:40 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-25 14:26:28 -0700 |
| commit | ce6663a9da77c0adc0743e801946dc1a49f4a186 (patch) | |
| tree | bd0fb10fb8133678b53079732fb54e266dea63b2 /tree-walk.c | |
| parent | 7d924c9139e33e7599d7aed0446e634c427a5f15 (diff) | |
| download | git-ce6663a9da77c0adc0743e801946dc1a49f4a186.tar.gz | |
tree-walk: convert tree_entry_extract() to use struct object_id
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'tree-walk.c')
| -rw-r--r-- | tree-walk.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tree-walk.c b/tree-walk.c index fab57dd524..ce27842439 100644 --- a/tree-walk.c +++ b/tree-walk.c @@ -433,10 +433,10 @@ static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char int namelen = strlen(name); while (t->size) { const char *entry; - const unsigned char *sha1; + const struct object_id *oid; int entrylen, cmp; - sha1 = tree_entry_extract(t, &entry, mode); + oid = tree_entry_extract(t, &entry, mode); entrylen = tree_entry_len(&t->entry); update_tree_entry(t); if (entrylen > namelen) @@ -447,7 +447,7 @@ static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char if (cmp < 0) break; if (entrylen == namelen) { - hashcpy(result, sha1); + hashcpy(result, oid->hash); return 0; } if (name[entrylen] != '/') @@ -455,10 +455,10 @@ static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char if (!S_ISDIR(*mode)) break; if (++entrylen == namelen) { - hashcpy(result, sha1); + hashcpy(result, oid->hash); return 0; } - return get_tree_entry(sha1, name + entrylen, result, mode); + return get_tree_entry(oid->hash, name + entrylen, result, mode); } return -1; } |