mirror of
https://github.com/git/git
synced 2024-07-05 00:58:49 +00:00
Neither of these functions ever returns a value other than zero. Instead, they expect unrecoverable errors to exit immediately, and things like "--exit-code" are stored inside the diff_options struct to be handled later via diff_result_code(). Some callers do check the return values, but many don't bother. Let's drop the useless return values, which are misleading callers about how the functions work. This could be seen as a step in the wrong direction, as we might want to eventually "lib-ify" these to more cleanly return errors up the stack, in which case we'd have to add the return values back in. But there are some benefits to doing this now: 1. In the current code, somebody could accidentally add a "return -1" to one of the functions, which would be erroneously ignored by many callers. By removing the return code, the compiler can notice the mismatch and force the developer to decide what to do. Obviously the other option here is that we could start consistently checking the error code in every caller. But it would be dead code, and we wouldn't get any compile-time help in catching new cases. 2. It communicates the situation to callers, who may want to choose a different function. These functions are really thin wrappers for doing git-diff-files and git-diff-index within the process. But callers who care about recovering from an error here are probably better off using the underlying library functions, many of which do return errors. If somebody eventually wants to teach these functions to propagate errors, they'll have to switch back to returning a value, effectively reverting this patch. But at least then they will be starting with a level playing field: they know that they will need to inspect each caller to see how it should handle the error. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
90 lines
2.4 KiB
C
90 lines
2.4 KiB
C
/*
|
|
* GIT - The information manager from hell
|
|
*
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
*/
|
|
#include "builtin.h"
|
|
#include "config.h"
|
|
#include "diff.h"
|
|
#include "diff-merges.h"
|
|
#include "commit.h"
|
|
#include "preload-index.h"
|
|
#include "repository.h"
|
|
#include "revision.h"
|
|
#include "submodule.h"
|
|
|
|
static const char diff_files_usage[] =
|
|
"git diff-files [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...]"
|
|
"\n"
|
|
COMMON_DIFF_OPTIONS_HELP;
|
|
|
|
int cmd_diff_files(int argc, const char **argv, const char *prefix)
|
|
{
|
|
struct rev_info rev;
|
|
int result;
|
|
unsigned options = 0;
|
|
|
|
if (argc == 2 && !strcmp(argv[1], "-h"))
|
|
usage(diff_files_usage);
|
|
|
|
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
|
|
|
|
prepare_repo_settings(the_repository);
|
|
the_repository->settings.command_requires_full_index = 0;
|
|
|
|
repo_init_revisions(the_repository, &rev, prefix);
|
|
rev.abbrev = 0;
|
|
|
|
/*
|
|
* Consider "intent-to-add" files as new by default, unless
|
|
* explicitly specified in the command line or anywhere else.
|
|
*/
|
|
rev.diffopt.ita_invisible_in_index = 1;
|
|
|
|
prefix = precompose_argv_prefix(argc, argv, prefix);
|
|
|
|
argc = setup_revisions(argc, argv, &rev, NULL);
|
|
while (1 < argc && argv[1][0] == '-') {
|
|
if (!strcmp(argv[1], "--base"))
|
|
rev.max_count = 1;
|
|
else if (!strcmp(argv[1], "--ours"))
|
|
rev.max_count = 2;
|
|
else if (!strcmp(argv[1], "--theirs"))
|
|
rev.max_count = 3;
|
|
else if (!strcmp(argv[1], "-q"))
|
|
options |= DIFF_SILENT_ON_REMOVED;
|
|
else
|
|
usage(diff_files_usage);
|
|
argv++; argc--;
|
|
}
|
|
if (!rev.diffopt.output_format)
|
|
rev.diffopt.output_format = DIFF_FORMAT_RAW;
|
|
rev.diffopt.rotate_to_strict = 1;
|
|
|
|
/*
|
|
* Make sure there are NO revision (i.e. pending object) parameter,
|
|
* rev.max_count is reasonable (0 <= n <= 3), and
|
|
* there is no other revision filtering parameters.
|
|
*/
|
|
if (rev.pending.nr ||
|
|
rev.min_age != -1 || rev.max_age != -1 ||
|
|
3 < rev.max_count)
|
|
usage(diff_files_usage);
|
|
|
|
/*
|
|
* "diff-files --base -p" should not combine merges because it
|
|
* was not asked to. "diff-files -c -p" should not densify
|
|
* (the user should ask with "diff-files --cc" explicitly).
|
|
*/
|
|
if (rev.max_count == -1 &&
|
|
(rev.diffopt.output_format & DIFF_FORMAT_PATCH))
|
|
diff_merges_set_dense_combined_if_unset(&rev);
|
|
|
|
if (repo_read_index_preload(the_repository, &rev.diffopt.pathspec, 0) < 0)
|
|
die_errno("repo_read_index_preload");
|
|
run_diff_files(&rev, options);
|
|
result = diff_result_code(&rev.diffopt, 0);
|
|
release_revisions(&rev);
|
|
return result;
|
|
}
|