tests: add a special setup where rebase.useBuiltin is off

diff --git a/builtin/diff-files.c b/builtin/diff-files.c
index 29d3e4f416746eda53c9d599d4adf92966ffff09..48cfcb935d0413fcf3850e0c28ec237b642b38a2 100644 (file)
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -21,9 +21,11 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
        int result;
        unsigned options = 0;
 
-       init_revisions(&rev, prefix);
-       gitmodules_config();
+       if (argc == 2 && !strcmp(argv[1], "-h"))
+               usage(diff_files_usage);
+
        git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
+       repo_init_revisions(the_repository, &rev, prefix);
        rev.abbrev = 0;
        precompose_argv(argc, argv);