diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-09-21 17:57:38 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-21 18:51:19 +0200 |
| commit | 2abf3503854e27e18b2fb5ba97ceeb3f79240ee5 (patch) | |
| tree | 32420041df8dc531f41f954438910fd308cdd5ff /merge-recursive.c | |
| parent | ws.c: remove implicit dependency on the_index (diff) | |
| download | git-2abf3503854e27e18b2fb5ba97ceeb3f79240ee5.tar.xz git-2abf3503854e27e18b2fb5ba97ceeb3f79240ee5.zip | |
revision.c: remove implicit dependency on the_index
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 7edcda4db0..82e9f1d24a 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1115,7 +1115,7 @@ static int find_first_merges(struct object_array *result, const char *path, /* get all revisions that merge commit a */ xsnprintf(merged_revision, sizeof(merged_revision), "^%s", oid_to_hex(&a->object.oid)); - init_revisions(&revs, NULL); + repo_init_revisions(the_repository, &revs, NULL); rev_opts.submodule = path; /* FIXME: can't handle linked worktrees in submodules yet */ revs.single_worktree = path != NULL; |