Merge branch 'tb/log-G-binary'

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 4cea086f80e657e57ed5ccb2c5f7eeb5c6a640ab..a9c6d60df22862e47ccb7fc1c7de9ed7cc4b1236 100644 (file)
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -140,8 +140,8 @@ static int pickaxe_match(struct diff_filepair *p, struct diff_options *o,
                return 0;
 
        if (o->flags.allow_textconv) {
-               textconv_one = get_textconv(o->repo->index, p->one);
-               textconv_two = get_textconv(o->repo->index, p->two);
+               textconv_one = get_textconv(o->repo, p->one);
+               textconv_two = get_textconv(o->repo, p->two);
        }
 
        /*