Provide git_config with a callback-data parameter

diff --git a/diff.h b/diff.h
index f2c77391a965bcc731de6478a6553cdc652319ec..1cf1eff485e58b3714e495888a3b26cf3b005049 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -88,7 +88,6 @@ struct diff_options {
        int abbrev;
        const char *prefix;
        int prefix_length;
-       const char *msg_sep;
        const char *stat_sep;
        long xdl_opts;
 
@@ -181,8 +180,8 @@ extern void diff_unmerge(struct diff_options *,
 #define DIFF_SETUP_USE_CACHE           2
 #define DIFF_SETUP_USE_SIZE_CACHE      4
 
-extern int git_diff_basic_config(const char *var, const char *value);
-extern int git_diff_ui_config(const char *var, const char *value);
+extern int git_diff_basic_config(const char *var, const char *value, void *cb);
+extern int git_diff_ui_config(const char *var, const char *value, void *cb);
 extern int diff_use_color_default;
 extern void diff_setup(struct diff_options *);
 extern int diff_opt_parse(struct diff_options *, const char **, int);