Merge branch 'jt/http-redact-cookies' into maint
[git.git] / builtin / diff-files.c
blobe88493ffe5d5d66461edb71832b58e8b3b4b2bc8
1 /*
2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
5 */
6 #include "cache.h"
7 #include "config.h"
8 #include "diff.h"
9 #include "commit.h"
10 #include "revision.h"
11 #include "builtin.h"
12 #include "submodule.h"
14 static const char diff_files_usage[] =
15 "git diff-files [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]"
16 COMMON_DIFF_OPTIONS_HELP;
18 int cmd_diff_files(int argc, const char **argv, const char *prefix)
20 struct rev_info rev;
21 int result;
22 unsigned options = 0;
24 if (argc == 2 && !strcmp(argv[1], "-h"))
25 usage(diff_files_usage);
27 git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
28 init_revisions(&rev, prefix);
29 rev.abbrev = 0;
30 precompose_argv(argc, argv);
32 argc = setup_revisions(argc, argv, &rev, NULL);
33 while (1 < argc && argv[1][0] == '-') {
34 if (!strcmp(argv[1], "--base"))
35 rev.max_count = 1;
36 else if (!strcmp(argv[1], "--ours"))
37 rev.max_count = 2;
38 else if (!strcmp(argv[1], "--theirs"))
39 rev.max_count = 3;
40 else if (!strcmp(argv[1], "-q"))
41 options |= DIFF_SILENT_ON_REMOVED;
42 else
43 usage(diff_files_usage);
44 argv++; argc--;
46 if (!rev.diffopt.output_format)
47 rev.diffopt.output_format = DIFF_FORMAT_RAW;
50 * Make sure there are NO revision (i.e. pending object) parameter,
51 * rev.max_count is reasonable (0 <= n <= 3), and
52 * there is no other revision filtering parameters.
54 if (rev.pending.nr ||
55 rev.min_age != -1 || rev.max_age != -1 ||
56 3 < rev.max_count)
57 usage(diff_files_usage);
60 * "diff-files --base -p" should not combine merges because it
61 * was not asked to. "diff-files -c -p" should not densify
62 * (the user should ask with "diff-files --cc" explicitly).
64 if (rev.max_count == -1 && !rev.combine_merges &&
65 (rev.diffopt.output_format & DIFF_FORMAT_PATCH))
66 rev.combine_merges = rev.dense_combined_merges = 1;
68 if (read_cache_preload(&rev.diffopt.pathspec) < 0) {
69 perror("read_cache_preload");
70 return -1;
72 result = run_diff_files(&rev, options);
73 return diff_result_code(&rev.diffopt, result);