userdiff: add diff.<driver>.process config

Add the process field to struct userdiff_driver and teach the
config parser to populate it from diff.<driver>.process.

Signed-off-by: Michael Montalbo <mmontalbo@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/userdiff.c b/userdiff.c
index b5412e6bc3ecd390d71a31e4d884d66d2af6c910..7547874aa2569d19eb1a5ab69909ee7a54596714 100644 (file)
--- a/userdiff.c
+++ b/userdiff.c
@@ -509,6 +509,13 @@ int userdiff_config(const char *k, const char *v)
                drv->algorithm = drv->algorithm_owned;
                return ret;
        }
+       if (!strcmp(type, "process")) {
+               int ret;
+               FREE_AND_NULL(drv->process_owned);
+               ret = git_config_string(&drv->process_owned, k, v);
+               drv->process = drv->process_owned;
+               return ret;
+       }
 
        return 0;
 }

diff --git a/userdiff.h b/userdiff.h
index 827361b0bc9569426ba35d5b47b066464d1b7b92..51c26e0d4190e59bd9f34ef09ad1b3f9ffbf3045 100644 (file)
--- a/userdiff.h
+++ b/userdiff.h
@@ -31,6 +31,8 @@ struct userdiff_driver {
        char *textconv_owned;
        struct notes_cache *textconv_cache;
        int textconv_want_cache;
+       const char *process;
+       char *process_owned;
 };
 enum userdiff_driver_type {
        USERDIFF_DRIVER_TYPE_BUILTIN = 1<<0,