X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=userdiff.c;h=67003fbb232cd85627f61c02a616b3d6a9ccd5d2;hb=c30c10cff1d640ce119596b907c10cc11f83358d;hp=df992490d5f86b5eff2b87e90090b1ec576aae9a;hpb=0476228de500049804ae599f557658c3f9042ad0;p=git.git

diff --git a/userdiff.c b/userdiff.c
index df992490d..67003fbb2 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -1,3 +1,4 @@
+#include "cache.h"
 #include "userdiff.h"
 #include "cache.h"
 #include "attr.h"
@@ -167,6 +168,12 @@ static int parse_tristate(int *b, const char *k, const char *v)
 	return 1;
 }
 
+static int parse_bool(int *b, const char *k, const char *v)
+{
+	*b = git_config_bool(k, v);
+	return 1;
+}
+
 int userdiff_config(const char *k, const char *v)
 {
 	struct userdiff_driver *drv;
@@ -181,6 +188,8 @@ int userdiff_config(const char *k, const char *v)
 		return parse_string(&drv->external, k, v);
 	if ((drv = parse_driver(k, v, "textconv")))
 		return parse_string(&drv->textconv, k, v);
+	if ((drv = parse_driver(k, v, "cachetextconv")))
+		return parse_bool(&drv->textconv_want_cache, k, v);
 	if ((drv = parse_driver(k, v, "wordregex")))
 		return parse_string(&drv->word_regex, k, v);