Merge branch 'js/config-cb'

diff --git a/builtin-diff-files.c b/builtin-diff-files.c
index e2306c162a55df30042a0bf87c9a60a1e02f5396..907392a1f3d9b548389708c8c56c20a05bb5a69c 100644 (file)
--- a/builtin-diff-files.c
+++ b/builtin-diff-files.c
@@ -21,7 +21,7 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
 
        prefix = setup_git_directory_gently(&nongit);
        init_revisions(&rev, prefix);
-       git_config(git_diff_basic_config); /* no "diff" UI options */
+       git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
        rev.abbrev = 0;
 
        if (!setup_diff_no_index(&rev, argc, argv, nongit, prefix))