merge-recursive.c: remove implicit dependency on the_repository

diff --git a/list-objects-filter.h b/list-objects-filter.h
index 52b4a84da9418497a4fc37e50cb8e0dcbc5b70bd..1d45a4ad5786c915f1fd597ce782cd96b7301532 100644 (file)
--- a/list-objects-filter.h
+++ b/list-objects-filter.h
@@ -4,6 +4,7 @@
 struct list_objects_filter_options;
 struct object;
 struct oidset;
+struct repository;
 
 /*
  * During list-object traversal we allow certain objects to be
@@ -60,6 +61,7 @@ enum list_objects_filter_situation {
 };
 
 typedef enum list_objects_filter_result (*filter_object_fn)(
+       struct repository *r,
        enum list_objects_filter_situation filter_situation,
        struct object *obj,
        const char *pathname,