mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tree-walk: convert tree entry functions to object_id

Browse Source 
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>
This commit is contained in:
brian m. carlson
2018-03-12 02:27:51 +00:00
committed by Junio C Hamano
parent 575042a04f
commit 916bc35b29
11 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
merge-recursive.c
View File

@ -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;