builtin/diff-files.c

   1 /*
   2  * GIT - The information manager from hell
   3  *
   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"
  11 #include "submodule.h"
  12
  13 static const char diff_files_usage[] =
  14 "git diff-files [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]"
  15 COMMON_DIFF_OPTIONS_HELP;
  16
  17 int cmd_diff_files(int argc, const char **argv, const char *prefix)
  18 {
  19         struct rev_info rev;
  20         int result;
  21         unsigned options = 0;
  22
  23         git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
  24         init_revisions(&rev, prefix);
  25         gitmodules_config();
  26         rev.abbrev = 0;
  27         precompose_argv(argc, argv);
  28
  29         argc = setup_revisions(argc, argv, &rev, NULL);
  30         while (1 < argc && argv[1][0] == '-') {
  31                 if (!strcmp(argv[1], "--base"))
  32                         rev.max_count = 1;
  33                 else if (!strcmp(argv[1], "--ours"))
  34                         rev.max_count = 2;
  35                 else if (!strcmp(argv[1], "--theirs"))
  36                         rev.max_count = 3;
  37                 else if (!strcmp(argv[1], "-q"))
  38                         options |= DIFF_SILENT_ON_REMOVED;
  39                 else
  40                         usage(diff_files_usage);
  41                 argv++; argc--;
  42         }
  43         if (!rev.diffopt.output_format)
  44                 rev.diffopt.output_format = DIFF_FORMAT_RAW;
  45
  46         /*
  47          * Make sure there are NO revision (i.e. pending object) parameter,
  48          * rev.max_count is reasonable (0 <= n <= 3), and
  49          * there is no other revision filtering parameters.
  50          */
  51         if (rev.pending.nr ||
  52             rev.min_age != -1 || rev.max_age != -1 ||
  53             3 < rev.max_count)
  54                 usage(diff_files_usage);
  55
  56         /*
  57          * "diff-files --base -p" should not combine merges because it
  58          * was not asked to.  "diff-files -c -p" should not densify
  59          * (the user should ask with "diff-files --cc" explicitly).
  60          */
  61         if (rev.max_count == -1 && !rev.combine_merges &&
  62             (rev.diffopt.output_format & DIFF_FORMAT_PATCH))
  63                 rev.combine_merges = rev.dense_combined_merges = 1;
  64
  65         if (read_cache_preload(&rev.diffopt.pathspec) < 0) {
  66                 perror("read_cache_preload");
  67                 return -1;
  68         }
  69         result = run_diff_files(&rev, options);
  70         return diff_result_code(&rev.diffopt, result);
  71 }