From 71f35d5cbc0336ca5dca6b638c31d96611d301a7 Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Sat, 6 May 2017 22:09:57 +0000 Subject: submodule: convert merge_submodule to use struct object_id This is a caller of lookup_commit_reference, which we will convert later. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- merge-recursive.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'merge-recursive.c') diff --git a/merge-recursive.c b/merge-recursive.c index 9d6fd577e..1315a45b9 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -994,11 +994,11 @@ static int merge_file_1(struct merge_options *o, return ret; result->clean = (merge_status == 0); } else if (S_ISGITLINK(a->mode)) { - result->clean = merge_submodule(result->oid.hash, + result->clean = merge_submodule(&result->oid, one->path, - one->oid.hash, - a->oid.hash, - b->oid.hash, + &one->oid, + &a->oid, + &b->oid, !o->call_depth); } else if (S_ISLNK(a->mode)) { oidcpy(&result->oid, &a->oid); -- cgit v1.2.1