mirror of
https://github.com/git/git.git
synced 2024-11-18 02:14:03 +01:00
9a1805a872
The diff porcelain uses git_diff_ui_config to set porcelain-ish config options, like automatically turning on color. The plumbing specifically avoids calling this function, since it doesn't want things like automatic color or rename detection. However, some diff options should be set for both plumbing and porcelain. For example, one can still turn on color in git-diff-files using the --color command line option. This means we want the color config from color.diff.* (so that once color is on, we use the user's preferred scheme), but _not_ the color.diff variable. We split the diff config into "ui" and "basic", where "basic" is suitable for use by plumbing (so _most_ things affecting the output should still go into the "ui" part). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
49 lines
1.1 KiB
C
49 lines
1.1 KiB
C
#include "cache.h"
|
|
#include "diff.h"
|
|
#include "commit.h"
|
|
#include "revision.h"
|
|
#include "builtin.h"
|
|
|
|
static const char diff_cache_usage[] =
|
|
"git-diff-index [-m] [--cached] "
|
|
"[<common diff options>] <tree-ish> [<path>...]"
|
|
COMMON_DIFF_OPTIONS_HELP;
|
|
|
|
int cmd_diff_index(int argc, const char **argv, const char *prefix)
|
|
{
|
|
struct rev_info rev;
|
|
int cached = 0;
|
|
int i;
|
|
int result;
|
|
|
|
init_revisions(&rev, prefix);
|
|
git_config(git_diff_basic_config); /* no "diff" UI options */
|
|
rev.abbrev = 0;
|
|
|
|
argc = setup_revisions(argc, argv, &rev, NULL);
|
|
for (i = 1; i < argc; i++) {
|
|
const char *arg = argv[i];
|
|
|
|
if (!strcmp(arg, "--cached"))
|
|
cached = 1;
|
|
else
|
|
usage(diff_cache_usage);
|
|
}
|
|
if (!rev.diffopt.output_format)
|
|
rev.diffopt.output_format = DIFF_FORMAT_RAW;
|
|
|
|
/*
|
|
* Make sure there is one revision (i.e. pending object),
|
|
* and there is no revision filtering parameters.
|
|
*/
|
|
if (rev.pending.nr != 1 ||
|
|
rev.max_count != -1 || rev.min_age != -1 || rev.max_age != -1)
|
|
usage(diff_cache_usage);
|
|
if (read_cache() < 0) {
|
|
perror("read_cache");
|
|
return -1;
|
|
}
|
|
result = run_diff_index(&rev, cached);
|
|
return diff_result_code(&rev.diffopt, result);
|
|
}
|