Merge branch 'jk/untracked-cache-more-fixes'

diff --git a/patch-ids.c b/patch-ids.c
index 960ea2405412cc5100e1bda4cb179248d04284df..c262e1be9c9c912cc12c5b60a08e69f8cf9a30c9 100644 (file)
--- a/patch-ids.c
+++ b/patch-ids.c
@@ -56,10 +56,10 @@ static int patch_id_neq(const void *cmpfn_data,
        return !oideq(&a->patch_id, &b->patch_id);
 }
 
-int init_patch_ids(struct patch_ids *ids)
+int init_patch_ids(struct repository *r, struct patch_ids *ids)
 {
        memset(ids, 0, sizeof(*ids));
-       diff_setup(&ids->diffopts);
+       repo_diff_setup(r, &ids->diffopts);
        ids->diffopts.detect_rename = 0;
        ids->diffopts.flags.recursive = 1;
        diff_setup_done(&ids->diffopts);