diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-03-12 02:27:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-14 16:23:50 (GMT) |
| commit | 916bc35b29af6e0f4f215dea9c84e4185de0fec4 (patch) | |
| tree | 21f8318b909c7dc21129bad02d6adc7d46fbc705 /merge-recursive.c | |
| parent | 575042a04f671fa1a9cf9d5c21b30a2dadbe6c7e (diff) | |
| download | git-916bc35b29af6e0f4f215dea9c84e4185de0fec4.zip git-916bc35b29af6e0f4f215dea9c84e4185de0fec4.tar.gz git-916bc35b29af6e0f4f215dea9c84e4185de0fec4.tar.bz2 | |
tree-walk: convert tree entry functions to object_id
Convert get_tree_entry and find_tree_entry to take pointers to struct
object_id.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index f58f139..85f8cbe 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -370,12 +370,12 @@ static struct stage_data *insert_stage_data(const char *path, { struct string_list_item *item; struct stage_data *e = xcalloc(1, sizeof(struct stage_data)); - get_tree_entry(o->object.oid.hash, path, - e->stages[1].oid.hash, &e->stages[1].mode); - get_tree_entry(a->object.oid.hash, path, - e->stages[2].oid.hash, &e->stages[2].mode); - get_tree_entry(b->object.oid.hash, path, - e->stages[3].oid.hash, &e->stages[3].mode); + get_tree_entry(&o->object.oid, path, + &e->stages[1].oid, &e->stages[1].mode); + get_tree_entry(&a->object.oid, path, + &e->stages[2].oid, &e->stages[2].mode); + get_tree_entry(&b->object.oid, path, + &e->stages[3].oid, &e->stages[3].mode); item = string_list_insert(entries, path); item->util = e; return e; |