remote-hg: tests: fix hg merge

diff --git a/builtin/check-ignore.c b/builtin/check-ignore.c
index 0240f99b57a2f81320b84951bf6dc89ab60d6282..854a88a0568e2f0226d26a2d9ebc99d24765053b 100644 (file)
--- a/builtin/check-ignore.c
+++ b/builtin/check-ignore.c
@@ -59,7 +59,6 @@ static int check_ignore(const char *prefix, const char **pathspec)
        const char *path, *full_path;
        char *seen;
        int num_ignored = 0, dtype = DT_UNKNOWN, i;
-       struct path_exclude_check check;
        struct exclude *exclude;
 
        /* read_cache() is only necessary so we can watch out for submodules. */
@@ -67,7 +66,6 @@ static int check_ignore(const char *prefix, const char **pathspec)
                die(_("index file corrupt"));
 
        memset(&dir, 0, sizeof(dir));
-       dir.flags |= DIR_COLLECT_IGNORED;
        setup_standard_excludes(&dir);
 
        if (!pathspec || !*pathspec) {
@@ -76,7 +74,6 @@ static int check_ignore(const char *prefix, const char **pathspec)
                return 0;
        }
 
-       path_exclude_check_init(&check, &dir);
        /*
         * look for pathspecs matching entries in the index, since these
         * should not be ignored, in order to be consistent with
@@ -90,8 +87,7 @@ static int check_ignore(const char *prefix, const char **pathspec)
                full_path = check_path_for_gitlink(full_path);
                die_if_path_beyond_symlink(full_path, prefix);
                if (!seen[i]) {
-                       exclude = last_exclude_matching_path(&check, full_path,
-                                                            -1, &dtype);
+                       exclude = last_exclude_matching(&dir, full_path, &dtype);
                        if (exclude) {
                                if (!quiet)
                                        output_exclude(path, exclude);
@@ -101,7 +97,6 @@ static int check_ignore(const char *prefix, const char **pathspec)
        }
        free(seen);
        clear_directory(&dir);
-       path_exclude_check_clear(&check);
 
        return num_ignored;
 }