diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-05-06 22:09:57 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-08 15:12:56 +0900 |
| commit | 71f35d5cbc0336ca5dca6b638c31d96611d301a7 (patch) | |
| tree | 3b707f9f55c7fe37d5a7e817ac532ea943ef64a8 /merge-recursive.c | |
| parent | 912c13d58faf355589a3f67fd55b2015561e0184 (diff) | |
| download | git-71f35d5cbc0336ca5dca6b638c31d96611d301a7.tar.gz git-71f35d5cbc0336ca5dca6b638c31d96611d301a7.tar.xz | |
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 <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 8 |
1 files changed, 4 insertions, 4 deletions
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); |