diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-09-21 18:57:27 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-21 19:48:10 +0300 |
| commit | 32eaa4688387d37398f0bc498335355a28efb0c7 (patch) | |
| tree | cef97cc234d7958b4c20d34e272baacdcc15ca48 /notes-merge.c | |
| parent | 5adbb403c24880b758149378bc7874d7617db4bc (diff) | |
ll-merge.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 'notes-merge.c')
| -rw-r--r-- | notes-merge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/notes-merge.c b/notes-merge.c index 9b154a5da6..432edfb89a 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -348,7 +348,8 @@ static int ll_merge_in_worktree(struct notes_merge_options *o, read_mmblob(&remote, &p->remote); status = ll_merge(&result_buf, oid_to_hex(&p->obj), &base, NULL, - &local, o->local_ref, &remote, o->remote_ref, NULL); + &local, o->local_ref, &remote, o->remote_ref, + &the_index, NULL); free(base.ptr); free(local.ptr); |