diff options
Diffstat (limited to 'builtin/diff-index.c')
| -rw-r--r-- | builtin/diff-index.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/builtin/diff-index.c b/builtin/diff-index.c index aea139b9d8..220f341ffa 100644 --- a/builtin/diff-index.c +++ b/builtin/diff-index.c @@ -1,11 +1,13 @@ -#define USE_THE_INDEX_COMPATIBILITY_MACROS -#include "cache.h" +#include "builtin.h" #include "config.h" #include "diff.h" #include "diff-merges.h" #include "commit.h" +#include "preload-index.h" +#include "repository.h" #include "revision.h" -#include "builtin.h" +#include "setup.h" +#include "sparse-index.h" #include "submodule.h" static const char diff_cache_usage[] = @@ -62,16 +64,16 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix) usage(diff_cache_usage); if (!(option & DIFF_INDEX_CACHED)) { setup_work_tree(); - if (read_cache_preload(&rev.diffopt.pathspec) < 0) { - perror("read_cache_preload"); + if (repo_read_index_preload(the_repository, &rev.diffopt.pathspec, 0) < 0) { + perror("repo_read_index_preload"); return -1; } - } else if (read_cache() < 0) { - perror("read_cache"); + } else if (repo_read_index(the_repository) < 0) { + perror("repo_read_index"); return -1; } - result = run_diff_index(&rev, option); - result = diff_result_code(&rev.diffopt, result); + run_diff_index(&rev, option); + result = diff_result_code(&rev.diffopt); release_revisions(&rev); return result; } |