builtin-diff-files.con commit merge-recursive: separate out xdl_merge() interface. (3e5261a)
   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
  12static const char diff_files_usage[] =
  13"git-diff-files [-q] [-0/-1/2/3 |-c|--cc|-n|--no-index] [<common diff options>] [<path>...]"
  14COMMON_DIFF_OPTIONS_HELP;
  15
  16int cmd_diff_files(int argc, const char **argv, const char *prefix)
  17{
  18        struct rev_info rev;
  19        int nongit = 0;
  20        int result;
  21
  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;
  26
  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;
  35}