08b775864e
In "config.c" we host both the business logic to read and write config files as well as the logic to parse specific Git-related variables. On the one hand this is mixing concerns, but even more importantly it means that we cannot easily remove the dependency on `the_repository` in our config parsing logic. Move the logic into "environment.c". This file is a grab bag of all kinds of global state already, so it is quite a good fit. Furthermore, it also hosts most of the global variables that we're parsing the config values into, making this an even better fit. Note that there is one hidden change: in `parse_fsync_components()` we use an `int` to iterate through `ARRAY_SIZE(fsync_component_names)`. But as -Wsign-compare warnings are enabled in this file this causes a compiler warning. The issue is fixed by using a `size_t` instead. This change allows us to drop the `USE_THE_REPOSITORY_VARIABLE` declaration. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
88 lines
2.1 KiB
C
88 lines
2.1 KiB
C
#define USE_THE_REPOSITORY_VARIABLE
|
|
#include "builtin.h"
|
|
#include "config.h"
|
|
#include "environment.h"
|
|
#include "gettext.h"
|
|
#include "hook.h"
|
|
#include "parse-options.h"
|
|
#include "strvec.h"
|
|
|
|
#define BUILTIN_HOOK_RUN_USAGE \
|
|
N_("git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-args>]")
|
|
|
|
static const char * const builtin_hook_usage[] = {
|
|
BUILTIN_HOOK_RUN_USAGE,
|
|
NULL
|
|
};
|
|
|
|
static const char * const builtin_hook_run_usage[] = {
|
|
BUILTIN_HOOK_RUN_USAGE,
|
|
NULL
|
|
};
|
|
|
|
static int run(int argc, const char **argv, const char *prefix,
|
|
struct repository *repo UNUSED)
|
|
{
|
|
int i;
|
|
struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
|
|
int ignore_missing = 0;
|
|
const char *hook_name;
|
|
struct option run_options[] = {
|
|
OPT_BOOL(0, "ignore-missing", &ignore_missing,
|
|
N_("silently ignore missing requested <hook-name>")),
|
|
OPT_STRING(0, "to-stdin", &opt.path_to_stdin, N_("path"),
|
|
N_("file to read into hooks' stdin")),
|
|
OPT_END(),
|
|
};
|
|
int ret;
|
|
|
|
argc = parse_options(argc, argv, prefix, run_options,
|
|
builtin_hook_run_usage,
|
|
PARSE_OPT_KEEP_DASHDASH);
|
|
|
|
if (!argc)
|
|
goto usage;
|
|
|
|
/*
|
|
* Having a -- for "run" when providing <hook-args> is
|
|
* mandatory.
|
|
*/
|
|
if (argc > 1 && strcmp(argv[1], "--") &&
|
|
strcmp(argv[1], "--end-of-options"))
|
|
goto usage;
|
|
|
|
/* Add our arguments, start after -- */
|
|
for (i = 2 ; i < argc; i++)
|
|
strvec_push(&opt.args, argv[i]);
|
|
|
|
/* Need to take into account core.hooksPath */
|
|
repo_config(the_repository, git_default_config, NULL);
|
|
|
|
hook_name = argv[0];
|
|
if (!ignore_missing)
|
|
opt.error_if_missing = 1;
|
|
ret = run_hooks_opt(the_repository, hook_name, &opt);
|
|
if (ret < 0) /* error() return */
|
|
ret = 1;
|
|
return ret;
|
|
usage:
|
|
usage_with_options(builtin_hook_run_usage, run_options);
|
|
}
|
|
|
|
int cmd_hook(int argc,
|
|
const char **argv,
|
|
const char *prefix,
|
|
struct repository *repo)
|
|
{
|
|
parse_opt_subcommand_fn *fn = NULL;
|
|
struct option builtin_hook_options[] = {
|
|
OPT_SUBCOMMAND("run", &fn, run),
|
|
OPT_END(),
|
|
};
|
|
|
|
argc = parse_options(argc, argv, NULL, builtin_hook_options,
|
|
builtin_hook_usage, 0);
|
|
|
|
return fn(argc, argv, prefix, repo);
|
|
}
|