Merge branch 'nd/the-index'

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 69fc55ea1e34af69b7ed4d57e521cb4825f99fd2..ad939d2861554746a9fd52947a38943928ece552 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);
        }
 
        /*