admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ll-merge.c: remove implicit dependency on the_index

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2018-09-21 17:57:27 +02:00
committed by Junio C Hamano
parent 5adbb403c2
commit 32eaa46883
9 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
notes-merge.c
View File

@@ -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);