Sync with maint

diff --git a/builtin/diff-files.c b/builtin/diff-files.c
index 15c61fd8d1ef891b013404ea5e7cbe42befac7bd..a572da9d5152ddf541f71e1aaf8abdb3c98f8ffe 100644 (file)
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -20,9 +20,9 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
        int result;
        unsigned options = 0;
 
+       git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
        init_revisions(&rev, prefix);
        gitmodules_config();
-       git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
        rev.abbrev = 0;
        precompose_argv(argc, argv);