Merge branch 'md/filter-trees'

diff --git a/userdiff.h b/userdiff.h
index 2ef0ce545278ea2f40526c42303c541736643bd5..b072bfe89a46efb47c2808b5469bdf1bbfb4cc63 100644 (file)
--- a/userdiff.h
+++ b/userdiff.h
@@ -3,6 +3,8 @@
 
 #include "notes-cache.h"
 
+struct index_state;
+
 struct userdiff_funcname {
        const char *pattern;
        int cflags;
@@ -21,7 +23,8 @@ struct userdiff_driver {
 
 int userdiff_config(const char *k, const char *v);
 struct userdiff_driver *userdiff_find_by_name(const char *name);
-struct userdiff_driver *userdiff_find_by_path(const char *path);
+struct userdiff_driver *userdiff_find_by_path(struct index_state *istate,
+                                             const char *path);
 
 /*
  * Initialize any textconv-related fields in the driver and return it, or NULL