Merge branch 'rs/diff-ihc'

diff --git a/patch-ids.c b/patch-ids.c
index a288fac9923a84cd05e8e7378f580ea3774e2a03..3be5d3165e0009761a0ca69e15e4a9132c6cfaff 100644 (file)
--- a/patch-ids.c
+++ b/patch-ids.c
@@ -121,7 +121,7 @@ int init_patch_ids(struct patch_ids *ids)
 {
        memset(ids, 0, sizeof(*ids));
        diff_setup(&ids->diffopts);
-       ids->diffopts.recursive = 1;
+       DIFF_OPT_SET(&ids->diffopts, RECURSIVE);
        if (diff_setup_done(&ids->diffopts) < 0)
                return error("diff_setup_done failed");
        return 0;