From c8bae7493d2f2910b57f13ded012e86bdcfb0532 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 16:47:53 +0200 Subject: Adding upstream version 1:2.39.2. Signed-off-by: Daniel Baumann --- builtin/diff-index.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 builtin/diff-index.c (limited to 'builtin/diff-index.c') diff --git a/builtin/diff-index.c b/builtin/diff-index.c new file mode 100644 index 0000000..35dc9b2 --- /dev/null +++ b/builtin/diff-index.c @@ -0,0 +1,76 @@ +#include "cache.h" +#include "config.h" +#include "diff.h" +#include "diff-merges.h" +#include "commit.h" +#include "revision.h" +#include "builtin.h" +#include "submodule.h" + +static const char diff_cache_usage[] = +"git diff-index [-m] [--cached] [--merge-base] " +"[] [...]" +"\n" +COMMON_DIFF_OPTIONS_HELP; + +int cmd_diff_index(int argc, const char **argv, const char *prefix) +{ + struct rev_info rev; + unsigned int option = 0; + int i; + int result; + + if (argc == 2 && !strcmp(argv[1], "-h")) + usage(diff_cache_usage); + + git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ + repo_init_revisions(the_repository, &rev, prefix); + rev.abbrev = 0; + prefix = precompose_argv_prefix(argc, argv, prefix); + + /* + * We need (some of) diff for merges options (e.g., --cc), and we need + * to avoid conflict with our own meaning of "-m". + */ + diff_merges_suppress_m_parsing(); + + argc = setup_revisions(argc, argv, &rev, NULL); + for (i = 1; i < argc; i++) { + const char *arg = argv[i]; + + if (!strcmp(arg, "--cached")) + option |= DIFF_INDEX_CACHED; + else if (!strcmp(arg, "--merge-base")) + option |= DIFF_INDEX_MERGE_BASE; + else if (!strcmp(arg, "-m")) + rev.match_missing = 1; + else + usage(diff_cache_usage); + } + if (!rev.diffopt.output_format) + rev.diffopt.output_format = DIFF_FORMAT_RAW; + + rev.diffopt.rotate_to_strict = 1; + + /* + * 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 (!(option & DIFF_INDEX_CACHED)) { + setup_work_tree(); + if (repo_read_index_preload(the_repository, &rev.diffopt.pathspec, 0) < 0) { + perror("repo_read_index_preload"); + return -1; + } + } else if (repo_read_index(the_repository) < 0) { + perror("repo_read_index"); + return -1; + } + result = run_diff_index(&rev, option); + result = diff_result_code(&rev.diffopt, result); + release_revisions(&rev); + return result; +} -- cgit v1.2.3