fixed wrong checking order when checking for staged status
[git/mingw/4msysgit/wingit-dll.git] / builtin-diff-index.c
blob04837494feba401c7f689eab5574768d3fd126de
1 #include "cache.h"
2 #include "diff.h"
3 #include "commit.h"
4 #include "revision.h"
5 #include "builtin.h"
7 static const char diff_cache_usage[] =
8 "git diff-index [-m] [--cached] "
9 "[<common diff options>] <tree-ish> [<path>...]"
10 COMMON_DIFF_OPTIONS_HELP;
12 int cmd_diff_index(int argc, const char **argv, const char *prefix)
14 struct rev_info rev;
15 int cached = 0;
16 int i;
17 int result;
19 init_revisions(&rev, prefix);
20 git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
21 rev.abbrev = 0;
23 argc = setup_revisions(argc, argv, &rev, NULL);
24 for (i = 1; i < argc; i++) {
25 const char *arg = argv[i];
27 if (!strcmp(arg, "--cached"))
28 cached = 1;
29 else
30 usage(diff_cache_usage);
32 if (!rev.diffopt.output_format)
33 rev.diffopt.output_format = DIFF_FORMAT_RAW;
36 * Make sure there is one revision (i.e. pending object),
37 * and there is no revision filtering parameters.
39 if (rev.pending.nr != 1 ||
40 rev.max_count != -1 || rev.min_age != -1 || rev.max_age != -1)
41 usage(diff_cache_usage);
42 if (!cached)
43 setup_work_tree();
44 if (read_cache() < 0) {
45 perror("read_cache");
46 return -1;
48 result = run_diff_index(&rev, cached);
49 return diff_result_code(&rev.diffopt, result);