global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-11 02:32:58 +00:00
Code Issues 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

2
diff.c
View File

@@ -3637,7 +3637,7 @@ static void builtin_checkdiff(const char *name_a, const char *name_b,
data.lineno = 0;
data.o = o;
data.ws_rule = whitespace_rule(attr_path);
data.conflict_marker_size = ll_merge_marker_size(attr_path);
data.conflict_marker_size = ll_merge_marker_size(o->repo->index, attr_path);
if (fill_mmfile(o->repo, &mf1, one) < 0 ||
fill_mmfile(o->repo, &mf2, two) < 0)