log,diff-tree: add --combined-all-paths option

diff --git a/userdiff.h b/userdiff.h
index 4a7e78ffbcc6d552a39dcccd9008d6c11919e432..203057e13e508adaaef1394da9fb086284c79733 100644 (file)
--- a/userdiff.h
+++ b/userdiff.h
@@ -3,6 +3,9 @@
 
 #include "notes-cache.h"
 
+struct index_state;
+struct repository;
+
 struct userdiff_funcname {
        const char *pattern;
        int cflags;
@@ -21,8 +24,14 @@ 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);
 
-struct userdiff_driver *userdiff_get_textconv(struct userdiff_driver *driver);
+/*
+ * Initialize any textconv-related fields in the driver and return it, or NULL
+ * if it does not have textconv enabled at all.
+ */
+struct userdiff_driver *userdiff_get_textconv(struct repository *r,
+                                             struct userdiff_driver *driver);
 
 #endif /* USERDIFF */