Merge branch 'gc/config-context'

[thirdparty/git.git] / builtin / difftool.c

diff --git a/builtin/difftool.c b/builtin/difftool.c
index e2c9ab7d5d7354783ef3e12d29a770fa82122c5f..24d88f88babd890763aa3db302a113a0f70fc088 100644 (file)
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -41,14 +41,15 @@ static const char *const builtin_difftool_usage[] = {
        NULL
 };
 
-static int difftool_config(const char *var, const char *value, void *cb)
+static int difftool_config(const char *var, const char *value,
+                          const struct config_context *ctx, void *cb)
 {
        if (!strcmp(var, "difftool.trustexitcode")) {
                trust_exit_code = git_config_bool(var, value);
                return 0;
        }
 
-       return git_default_config(var, value, cb);
+       return git_default_config(var, value, ctx, cb);
 }
 
 static int print_tool_help(void)