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 /match-trees.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 'match-trees.c')
| -rw-r--r-- | match-trees.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/match-trees.c b/match-trees.c index 751f8f2011..8ca7c68f5f 100644 --- a/match-trees.c +++ b/match-trees.c @@ -131,14 +131,14 @@ static void match_trees(const unsigned char *hash1, while (one.size) { const char *path; - const unsigned char *elem; + const struct object_id *elem; unsigned mode; int score; elem = tree_entry_extract(&one, &path, &mode); if (!S_ISDIR(mode)) goto next; - score = score_trees(elem, hash2); + score = score_trees(elem->hash, hash2); if (*best_score < score) { free(*best_match); *best_match = xstrfmt("%s%s", base, path); @@ -146,7 +146,7 @@ static void match_trees(const unsigned char *hash1, } if (recurse_limit) { char *newbase = xstrfmt("%s%s/", base, path); - match_trees(elem, hash2, best_score, best_match, + match_trees(elem->hash, hash2, best_score, best_match, newbase, recurse_limit - 1); free(newbase); } @@ -191,15 +191,15 @@ static int splice_tree(const unsigned char *hash1, while (desc.size) { const char *name; unsigned mode; - const unsigned char *sha1; + const struct object_id *oid; - sha1 = tree_entry_extract(&desc, &name, &mode); + oid = tree_entry_extract(&desc, &name, &mode); if (strlen(name) == toplen && !memcmp(name, prefix, toplen)) { if (!S_ISDIR(mode)) die("entry %s in tree %s is not a tree", name, sha1_to_hex(hash1)); - rewrite_here = (unsigned char *) sha1; + rewrite_here = (unsigned char *) oid->hash; break; } update_tree_entry(&desc); |