diff.c: remove the_index dependency in textconv() functions
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:

committed by
Junio C Hamano

parent
a470beea39
commit
6afaf80785
@ -153,8 +153,8 @@ static int pickaxe_match(struct diff_filepair *p, struct diff_options *o,
|
||||
if (textconv_one == textconv_two && diff_unmodified_pair(p))
|
||||
return 0;
|
||||
|
||||
mf1.size = fill_textconv(textconv_one, p->one, &mf1.ptr);
|
||||
mf2.size = fill_textconv(textconv_two, p->two, &mf2.ptr);
|
||||
mf1.size = fill_textconv(o->repo, textconv_one, p->one, &mf1.ptr);
|
||||
mf2.size = fill_textconv(o->repo, textconv_two, p->two, &mf2.ptr);
|
||||
|
||||
ret = fn(DIFF_FILE_VALID(p->one) ? &mf1 : NULL,
|
||||
DIFF_FILE_VALID(p->two) ? &mf2 : NULL,
|
||||
|
Reference in New Issue
Block a user