Merge branch 'fc/fetch-with-import-fix'

diff --git a/builtin/diff-files.c b/builtin/diff-files.c
index e88493ffe5d5d66461edb71832b58e8b3b4b2bc8..86ae474fbfb410f026d42ce9f36e9805a98cfc82 100644 (file)
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -3,6 +3,7 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  */
+#define USE_THE_INDEX_COMPATIBILITY_MACROS
 #include "cache.h"
 #include "config.h"
 #include "diff.h"
@@ -25,7 +26,7 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
                usage(diff_files_usage);
 
        git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
-       init_revisions(&rev, prefix);
+       repo_init_revisions(the_repository, &rev, prefix);
        rev.abbrev = 0;
        precompose_argv(argc, argv);