diff options
| author | Stefan Beller <sbeller@google.com> | 2018-06-29 03:21:58 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-29 19:43:39 +0200 |
| commit | 2122f6754c93be8f02bfb5704ed96c88fc9837a8 (patch) | |
| tree | 859ca68d6cfa9b3a3198a80b1f97c8d4e191fad8 /merge-recursive.c | |
| parent | commit: add repository argument to lookup_commit_reference_gently (diff) | |
| download | git-2122f6754c93be8f02bfb5704ed96c88fc9837a8.tar.xz git-2122f6754c93be8f02bfb5704ed96c88fc9837a8.zip | |
commit: add repository argument to lookup_commit_reference
Add a repository argument to allow callers of lookup_commit_reference
to be more specific about which repository to handle. This is a small
mechanical change; it doesn't change the implementation to handle
repositories other than the_repository yet.
As with the previous commits, use a macro to catch callers passing a
repository other than the_repository at compile time.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index fbb044e6f6..41366e75e2 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1192,9 +1192,9 @@ static int merge_submodule(struct merge_options *o, return 0; } - if (!(commit_base = lookup_commit_reference(base)) || - !(commit_a = lookup_commit_reference(a)) || - !(commit_b = lookup_commit_reference(b))) { + if (!(commit_base = lookup_commit_reference(the_repository, base)) || + !(commit_a = lookup_commit_reference(the_repository, a)) || + !(commit_b = lookup_commit_reference(the_repository, b))) { output(o, 1, _("Failed to merge submodule %s (commits not present)"), path); return 0; } |