Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
[git/jnareb-git.git] / builtin-diff-files.c
blob6ba5077a2be6619f110280622cf46a7f4cfb8b01
1 /*
2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
5 */
6 #include "cache.h"
7 #include "diff.h"
8 #include "commit.h"
9 #include "revision.h"
10 #include "builtin.h"
12 static const char diff_files_usage[] =
13 "git-diff-files [-q] [-0/-1/2/3 |-c|--cc|-n|--no-index] [<common diff options>] [<path>...]"
14 COMMON_DIFF_OPTIONS_HELP;
16 int cmd_diff_files(int argc, const char **argv, const char *prefix)
18 struct rev_info rev;
19 int nongit = 0;
20 int result;
22 prefix = setup_git_directory_gently(&nongit);
23 init_revisions(&rev, prefix);
24 git_config(git_default_config); /* no "diff" UI options */
25 rev.abbrev = 0;
27 if (!setup_diff_no_index(&rev, argc, argv, nongit, prefix))
28 argc = 0;
29 else
30 argc = setup_revisions(argc, argv, &rev, NULL);
31 if (!rev.diffopt.output_format)
32 rev.diffopt.output_format = DIFF_FORMAT_RAW;
33 result = run_diff_files_cmd(&rev, argc, argv);
34 return rev.diffopt.exit_with_status ? rev.diffopt.has_changes: result;