]> git.ipfire.org Git - thirdparty/git.git/blame - builtin-diff-files.c
GIT-VERSION-FILE: check ./version first.
[thirdparty/git.git] / builtin-diff-files.c
CommitLineData
8bc9a0c7
LT
1/*
2 * GIT - The information manager from hell
3 *
4 * Copyright (C) Linus Torvalds, 2005
5 */
e83c5163 6#include "cache.h"
4a6bf9e1 7#include "diff.h"
91539833
LT
8#include "commit.h"
9#include "revision.h"
e8cc9cd9 10#include "builtin.h"
c0fb976a 11
4d1f1190 12static const char diff_files_usage[] =
ea726d02 13"git-diff-files [-q] [-0/-1/2/3 |-c|--cc] [<common diff options>] [<path>...]"
dda2d79a 14COMMON_DIFF_OPTIONS_HELP;
b8f80925 15
a633fca0 16int cmd_diff_files(int argc, const char **argv, const char *prefix)
e83c5163 17{
6973dcae
JH
18 struct rev_info rev;
19 int silent = 0;
e83c5163 20
a633fca0 21 init_revisions(&rev, prefix);
ef1d9c5a 22 git_config(git_default_config); /* no "diff" UI options */
6973dcae
JH
23 rev.abbrev = 0;
24
25 argc = setup_revisions(argc, argv, &rev, NULL);
b8f80925 26 while (1 < argc && argv[1][0] == '-') {
6973dcae
JH
27 if (!strcmp(argv[1], "--base"))
28 rev.max_count = 1;
10637b84 29 else if (!strcmp(argv[1], "--ours"))
6973dcae 30 rev.max_count = 2;
10637b84 31 else if (!strcmp(argv[1], "--theirs"))
6973dcae 32 rev.max_count = 3;
10637b84 33 else if (!strcmp(argv[1], "-q"))
d15aa430 34 silent = 1;
6973dcae
JH
35 else
36 usage(diff_files_usage);
b8f80925 37 argv++; argc--;
e2e5e98a 38 }
c9b5ef99
TH
39 if (!rev.diffopt.output_format)
40 rev.diffopt.output_format = DIFF_FORMAT_RAW;
41
6973dcae
JH
42 /*
43 * Make sure there are NO revision (i.e. pending object) parameter,
44 * rev.max_count is reasonable (0 <= n <= 3),
45 * there is no other revision filtering parameters.
46 */
1f1e895f 47 if (rev.pending.nr ||
6973dcae 48 rev.min_age != -1 || rev.max_age != -1)
4727f640 49 usage(diff_files_usage);
6973dcae 50 return run_diff_files(&rev, silent);
e83c5163 51}