Merge branch 'en/merge-path-collision'
[git] / builtin / diff-index.c
1 #define USE_THE_INDEX_COMPATIBILITY_MACROS
2 #include "cache.h"
3 #include "config.h"
4 #include "diff.h"
5 #include "commit.h"
6 #include "revision.h"
7 #include "builtin.h"
8 #include "submodule.h"
9
10 static const char diff_cache_usage[] =
11 "git diff-index [-m] [--cached] "
12 "[<common-diff-options>] <tree-ish> [<path>...]"
13 COMMON_DIFF_OPTIONS_HELP;
14
15 int cmd_diff_index(int argc, const char **argv, const char *prefix)
16 {
17         struct rev_info rev;
18         int cached = 0;
19         int i;
20         int result;
21
22         if (argc == 2 && !strcmp(argv[1], "-h"))
23                 usage(diff_cache_usage);
24
25         git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
26         repo_init_revisions(the_repository, &rev, prefix);
27         rev.abbrev = 0;
28         precompose_argv(argc, argv);
29
30         argc = setup_revisions(argc, argv, &rev, NULL);
31         for (i = 1; i < argc; i++) {
32                 const char *arg = argv[i];
33
34                 if (!strcmp(arg, "--cached"))
35                         cached = 1;
36                 else
37                         usage(diff_cache_usage);
38         }
39         if (!rev.diffopt.output_format)
40                 rev.diffopt.output_format = DIFF_FORMAT_RAW;
41
42         /*
43          * Make sure there is one revision (i.e. pending object),
44          * and there is no revision filtering parameters.
45          */
46         if (rev.pending.nr != 1 ||
47             rev.max_count != -1 || rev.min_age != -1 || rev.max_age != -1)
48                 usage(diff_cache_usage);
49         if (!cached) {
50                 setup_work_tree();
51                 if (read_cache_preload(&rev.diffopt.pathspec) < 0) {
52                         perror("read_cache_preload");
53                         return -1;
54                 }
55         } else if (read_cache() < 0) {
56                 perror("read_cache");
57                 return -1;
58         }
59         result = run_diff_index(&rev, cached);
60         UNLEAK(rev);
61         return diff_result_code(&rev.diffopt, result);
62 }