2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
12 static const char diff_files_usage
[] =
13 "git-diff-files [-q] [-0/-1/2/3 |-c|--cc] [<common diff options>] [<path>...]"
14 COMMON_DIFF_OPTIONS_HELP
;
16 int cmd_diff_files(int argc
, const char **argv
, char **envp
)
22 git_config(git_default_config
); /* no "diff" UI options */
25 argc
= setup_revisions(argc
, argv
, &rev
, NULL
);
26 while (1 < argc
&& argv
[1][0] == '-') {
27 if (!strcmp(argv
[1], "--base"))
29 else if (!strcmp(argv
[1], "--ours"))
31 else if (!strcmp(argv
[1], "--theirs"))
33 else if (!strcmp(argv
[1], "-q"))
36 usage(diff_files_usage
);
39 if (!rev
.diffopt
.output_format
)
40 rev
.diffopt
.output_format
= DIFF_FORMAT_RAW
;
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.
48 rev
.min_age
!= -1 || rev
.max_age
!= -1)
49 usage(diff_files_usage
);
51 * Backward compatibility wart - "diff-files -s" used to
52 * defeat the common diff option "-s" which asked for
53 * DIFF_FORMAT_NO_OUTPUT.
55 if (rev
.diffopt
.output_format
== DIFF_FORMAT_NO_OUTPUT
)
56 rev
.diffopt
.output_format
= DIFF_FORMAT_RAW
;
57 return run_diff_files(&rev
, silent
);