Merge branch 'ps/config-wo-the-repository'
Use of API functions that implicitly depend on the_repository object in the config subsystem has been rewritten to pass a repository object through the callchain. * ps/config-wo-the-repository: config: hide functions using `the_repository` by default global: prepare for hiding away repo-less config functions config: don't depend on `the_repository` with branch conditions config: don't have setters depend on `the_repository` config: pass repo to functions that rename or copy sections config: pass repo to `git_die_config()` config: pass repo to `git_config_get_expiry_in_days()` config: pass repo to `git_config_get_expiry()` config: pass repo to `git_config_get_max_percent_split_change()` config: pass repo to `git_config_get_split_index()` config: pass repo to `git_config_get_index_threads()` config: expose `repo_config_clear()` config: introduce missing setters that take repo as parameter path: hide functions using `the_repository` by default path: stop relying on `the_repository` in `worktree_git_path()` path: stop relying on `the_repository` when reporting garbage hooks: remove implicit dependency on `the_repository` editor: do not rely on `the_repository` for interactive edits path: expose `do_git_common_path()` as `repo_common_pathv()` path: expose `do_git_path()` as `repo_git_pathv()`
This commit is contained in:
@@ -792,7 +792,7 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed,
|
||||
struct child_process proc = CHILD_PROCESS_INIT;
|
||||
struct async muxer;
|
||||
int code;
|
||||
const char *hook_path = find_hook(hook_name);
|
||||
const char *hook_path = find_hook(the_repository, hook_name);
|
||||
|
||||
if (!hook_path)
|
||||
return 0;
|
||||
@@ -922,7 +922,7 @@ static int run_update_hook(struct command *cmd)
|
||||
{
|
||||
struct child_process proc = CHILD_PROCESS_INIT;
|
||||
int code;
|
||||
const char *hook_path = find_hook("update");
|
||||
const char *hook_path = find_hook(the_repository, "update");
|
||||
|
||||
if (!hook_path)
|
||||
return 0;
|
||||
@@ -1098,7 +1098,7 @@ static int run_proc_receive_hook(struct command *commands,
|
||||
int hook_use_push_options = 0;
|
||||
int version = 0;
|
||||
int code;
|
||||
const char *hook_path = find_hook("proc-receive");
|
||||
const char *hook_path = find_hook(the_repository, "proc-receive");
|
||||
|
||||
if (!hook_path) {
|
||||
rp_error("cannot find hook 'proc-receive'");
|
||||
@@ -1409,7 +1409,7 @@ static const char *push_to_checkout(unsigned char *hash,
|
||||
strvec_pushf(env, "GIT_WORK_TREE=%s", absolute_path(work_tree));
|
||||
strvec_pushv(&opt.env, env->v);
|
||||
strvec_push(&opt.args, hash_to_hex(hash));
|
||||
if (run_hooks_opt(push_to_checkout_hook, &opt))
|
||||
if (run_hooks_opt(the_repository, push_to_checkout_hook, &opt))
|
||||
return "push-to-checkout hook declined";
|
||||
else
|
||||
return NULL;
|
||||
@@ -1618,7 +1618,7 @@ static void run_update_post_hook(struct command *commands)
|
||||
struct child_process proc = CHILD_PROCESS_INIT;
|
||||
const char *hook;
|
||||
|
||||
hook = find_hook("post-update");
|
||||
hook = find_hook(the_repository, "post-update");
|
||||
if (!hook)
|
||||
return;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user