freshlybakedca.ke
Git fork
hooks: remove implicit dependency on `the_repository`
We implicitly depend on `the_repository` in our hook subsystem because
we use `strbuf_git_path()` to compute hook paths. Remove this dependency
by accepting a `struct repository` as parameter instead.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
authored by
Patrick Steinhardt
and committed by
Junio C Hamano
169c9797
419dbb29
+5
-4
builtin/am.c
+5
-4
builtin/am.c
···
490
assert(state->msg);
491
492
if (!state->no_verify)
493
-
ret = run_hooks_l("applypatch-msg", am_path(state, "final-commit"), NULL);
494
495
if (!ret) {
496
FREE_AND_NULL(state->msg);
···
512
strvec_push(&opt.args, "rebase");
513
opt.path_to_stdin = am_path(state, "rewritten");
514
515
-
return run_hooks_opt("post-rewrite", &opt);
516
}
517
518
/**
···
1663
const char *reflog_msg, *author, *committer = NULL;
1664
struct strbuf sb = STRBUF_INIT;
1665
1666
-
if (!state->no_verify && run_hooks("pre-applypatch"))
1667
exit(1);
1668
1669
if (write_index_as_tree(&tree, the_repository->index, get_index_file(), 0, NULL))
···
1716
fclose(fp);
1717
}
1718
1719
-
run_hooks("post-applypatch");
1720
1721
free_commit_list(parents);
1722
strbuf_release(&sb);
···
490
assert(state->msg);
491
492
if (!state->no_verify)
493
+
ret = run_hooks_l(the_repository, "applypatch-msg",
494
+
am_path(state, "final-commit"), NULL);
495
496
if (!ret) {
497
FREE_AND_NULL(state->msg);
···
513
strvec_push(&opt.args, "rebase");
514
opt.path_to_stdin = am_path(state, "rewritten");
515
516
+
return run_hooks_opt(the_repository, "post-rewrite", &opt);
517
}
518
519
/**
···
1664
const char *reflog_msg, *author, *committer = NULL;
1665
struct strbuf sb = STRBUF_INIT;
1666
1667
+
if (!state->no_verify && run_hooks(the_repository, "pre-applypatch"))
1668
exit(1);
1669
1670
if (write_index_as_tree(&tree, the_repository->index, get_index_file(), 0, NULL))
···
1717
fclose(fp);
1718
}
1719
1720
+
run_hooks(the_repository, "post-applypatch");
1721
1722
free_commit_list(parents);
1723
strbuf_release(&sb);
+1
-1
builtin/bugreport.c
+1
-1
builtin/bugreport.c
+1
-1
builtin/checkout.c
+1
-1
builtin/checkout.c
···
125
static int post_checkout_hook(struct commit *old_commit, struct commit *new_commit,
126
int changed)
127
{
128
-
return run_hooks_l("post-checkout",
129
oid_to_hex(old_commit ? &old_commit->object.oid : null_oid()),
130
oid_to_hex(new_commit ? &new_commit->object.oid : null_oid()),
131
changed ? "1" : "0", NULL);
···
125
static int post_checkout_hook(struct commit *old_commit, struct commit *new_commit,
126
int changed)
127
{
128
+
return run_hooks_l(the_repository, "post-checkout",
129
oid_to_hex(old_commit ? &old_commit->object.oid : null_oid()),
130
oid_to_hex(new_commit ? &new_commit->object.oid : null_oid()),
131
changed ? "1" : "0", NULL);
+1
-1
builtin/clone.c
+1
-1
builtin/clone.c
···
788
if (write_locked_index(the_repository->index, &lock_file, COMMIT_LOCK))
789
die(_("unable to write new index file"));
790
791
+
err |= run_hooks_l(the_repository, "post-checkout", oid_to_hex(null_oid()),
792
oid_to_hex(&oid), "1", NULL);
793
794
if (!err && (option_recurse_submodules.nr > 0)) {
+1
-1
builtin/gc.c
+1
-1
builtin/gc.c
+1
-1
builtin/hook.c
+1
-1
builtin/hook.c
+1
-1
builtin/merge.c
+1
-1
builtin/merge.c
+1
-1
builtin/rebase.c
+1
-1
builtin/rebase.c
+5
-5
builtin/receive-pack.c
+5
-5
builtin/receive-pack.c
···
792
struct child_process proc = CHILD_PROCESS_INIT;
793
struct async muxer;
794
int code;
795
-
const char *hook_path = find_hook(hook_name);
796
797
if (!hook_path)
798
return 0;
···
922
{
923
struct child_process proc = CHILD_PROCESS_INIT;
924
int code;
925
-
const char *hook_path = find_hook("update");
926
927
if (!hook_path)
928
return 0;
···
1098
int hook_use_push_options = 0;
1099
int version = 0;
1100
int code;
1101
-
const char *hook_path = find_hook("proc-receive");
1102
1103
if (!hook_path) {
1104
rp_error("cannot find hook 'proc-receive'");
···
1409
strvec_pushf(env, "GIT_WORK_TREE=%s", absolute_path(work_tree));
1410
strvec_pushv(&opt.env, env->v);
1411
strvec_push(&opt.args, hash_to_hex(hash));
1412
-
if (run_hooks_opt(push_to_checkout_hook, &opt))
1413
return "push-to-checkout hook declined";
1414
else
1415
return NULL;
···
1618
struct child_process proc = CHILD_PROCESS_INIT;
1619
const char *hook;
1620
1621
-
hook = find_hook("post-update");
1622
if (!hook)
1623
return;
1624
···
792
struct child_process proc = CHILD_PROCESS_INIT;
793
struct async muxer;
794
int code;
795
+
const char *hook_path = find_hook(the_repository, hook_name);
796
797
if (!hook_path)
798
return 0;
···
922
{
923
struct child_process proc = CHILD_PROCESS_INIT;
924
int code;
925
+
const char *hook_path = find_hook(the_repository, "update");
926
927
if (!hook_path)
928
return 0;
···
1098
int hook_use_push_options = 0;
1099
int version = 0;
1100
int code;
1101
+
const char *hook_path = find_hook(the_repository, "proc-receive");
1102
1103
if (!hook_path) {
1104
rp_error("cannot find hook 'proc-receive'");
···
1409
strvec_pushf(env, "GIT_WORK_TREE=%s", absolute_path(work_tree));
1410
strvec_pushv(&opt.env, env->v);
1411
strvec_push(&opt.args, hash_to_hex(hash));
1412
+
if (run_hooks_opt(the_repository, push_to_checkout_hook, &opt))
1413
return "push-to-checkout hook declined";
1414
else
1415
return NULL;
···
1618
struct child_process proc = CHILD_PROCESS_INIT;
1619
const char *hook;
1620
1621
+
hook = find_hook(the_repository, "post-update");
1622
if (!hook)
1623
return;
1624
+1
-1
builtin/worktree.c
+1
-1
builtin/worktree.c
+1
-1
commit.c
+1
-1
commit.c
+11
-10
hook.c
+11
-10
hook.c
···
10
#include "environment.h"
11
#include "setup.h"
12
13
-
const char *find_hook(const char *name)
14
{
15
static struct strbuf path = STRBUF_INIT;
16
17
int found_hook;
18
19
strbuf_reset(&path);
20
-
strbuf_git_path(&path, "hooks/%s", name);
21
found_hook = access(path.buf, X_OK) >= 0;
22
#ifdef STRIP_EXTENSION
23
if (!found_hook) {
···
48
return path.buf;
49
}
50
51
-
int hook_exists(const char *name)
52
{
53
-
return !!find_hook(name);
54
}
55
56
static int pick_next_hook(struct child_process *cp,
···
121
strvec_clear(&options->args);
122
}
123
124
-
int run_hooks_opt(const char *hook_name, struct run_hooks_opt *options)
125
{
126
struct strbuf abs_path = STRBUF_INIT;
127
struct hook_cb_data cb_data = {
···
129
.hook_name = hook_name,
130
.options = options,
131
};
132
-
const char *const hook_path = find_hook(hook_name);
133
int ret = 0;
134
const struct run_process_parallel_opts opts = {
135
.tr2_category = "hook",
···
173
return ret;
174
}
175
176
-
int run_hooks(const char *hook_name)
177
{
178
struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
179
180
-
return run_hooks_opt(hook_name, &opt);
181
}
182
183
-
int run_hooks_l(const char *hook_name, ...)
184
{
185
struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
186
va_list ap;
···
191
strvec_push(&opt.args, arg);
192
va_end(ap);
193
194
-
return run_hooks_opt(hook_name, &opt);
195
}
···
10
#include "environment.h"
11
#include "setup.h"
12
13
+
const char *find_hook(struct repository *r, const char *name)
14
{
15
static struct strbuf path = STRBUF_INIT;
16
17
int found_hook;
18
19
strbuf_reset(&path);
20
+
strbuf_repo_git_path(&path, r, "hooks/%s", name);
21
found_hook = access(path.buf, X_OK) >= 0;
22
#ifdef STRIP_EXTENSION
23
if (!found_hook) {
···
48
return path.buf;
49
}
50
51
+
int hook_exists(struct repository *r, const char *name)
52
{
53
+
return !!find_hook(r, name);
54
}
55
56
static int pick_next_hook(struct child_process *cp,
···
121
strvec_clear(&options->args);
122
}
123
124
+
int run_hooks_opt(struct repository *r, const char *hook_name,
125
+
struct run_hooks_opt *options)
126
{
127
struct strbuf abs_path = STRBUF_INIT;
128
struct hook_cb_data cb_data = {
···
130
.hook_name = hook_name,
131
.options = options,
132
};
133
+
const char *const hook_path = find_hook(r, hook_name);
134
int ret = 0;
135
const struct run_process_parallel_opts opts = {
136
.tr2_category = "hook",
···
174
return ret;
175
}
176
177
+
int run_hooks(struct repository *r, const char *hook_name)
178
{
179
struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
180
181
+
return run_hooks_opt(r, hook_name, &opt);
182
}
183
184
+
int run_hooks_l(struct repository *r, const char *hook_name, ...)
185
{
186
struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
187
va_list ap;
···
192
strvec_push(&opt.args, arg);
193
va_end(ap);
194
195
+
return run_hooks_opt(r, hook_name, &opt);
196
}
+8
-5
hook.h
+8
-5
hook.h
···
2
#define HOOK_H
3
#include "strvec.h"
4
5
struct run_hooks_opt
6
{
7
/* Environment vars to be set for each hook */
···
55
* or disabled. Note that this points to static storage that will be
56
* overwritten by further calls to find_hook and run_hook_*.
57
*/
58
-
const char *find_hook(const char *name);
59
60
/**
61
* A boolean version of find_hook()
62
*/
63
-
int hook_exists(const char *hookname);
64
65
/**
66
* Takes a `hook_name`, resolves it to a path with find_hook(), and
···
70
* Returns the status code of the run hook, or a negative value on
71
* error().
72
*/
73
-
int run_hooks_opt(const char *hook_name, struct run_hooks_opt *options);
74
75
/**
76
* A wrapper for run_hooks_opt() which provides a dummy "struct
77
* run_hooks_opt" initialized with "RUN_HOOKS_OPT_INIT".
78
*/
79
-
int run_hooks(const char *hook_name);
80
81
/**
82
* Like run_hooks(), a wrapper for run_hooks_opt().
···
87
* hook. This function behaves like the old run_hook_le() API.
88
*/
89
LAST_ARG_MUST_BE_NULL
90
-
int run_hooks_l(const char *hook_name, ...);
91
#endif
···
2
#define HOOK_H
3
#include "strvec.h"
4
5
+
struct repository;
6
+
7
struct run_hooks_opt
8
{
9
/* Environment vars to be set for each hook */
···
57
* or disabled. Note that this points to static storage that will be
58
* overwritten by further calls to find_hook and run_hook_*.
59
*/
60
+
const char *find_hook(struct repository *r, const char *name);
61
62
/**
63
* A boolean version of find_hook()
64
*/
65
+
int hook_exists(struct repository *r, const char *hookname);
66
67
/**
68
* Takes a `hook_name`, resolves it to a path with find_hook(), and
···
72
* Returns the status code of the run hook, or a negative value on
73
* error().
74
*/
75
+
int run_hooks_opt(struct repository *r, const char *hook_name,
76
+
struct run_hooks_opt *options);
77
78
/**
79
* A wrapper for run_hooks_opt() which provides a dummy "struct
80
* run_hooks_opt" initialized with "RUN_HOOKS_OPT_INIT".
81
*/
82
+
int run_hooks(struct repository *r, const char *hook_name);
83
84
/**
85
* Like run_hooks(), a wrapper for run_hooks_opt().
···
90
* hook. This function behaves like the old run_hook_le() API.
91
*/
92
LAST_ARG_MUST_BE_NULL
93
+
int run_hooks_l(struct repository *r, const char *hook_name, ...);
94
#endif
+3
-3
read-cache.c
+3
-3
read-cache.c
+1
-1
refs.c
+1
-1
refs.c
+1
-1
reset.c
+1
-1
reset.c
+3
-3
sequencer.c
+3
-3
sequencer.c
···
1316
struct child_process proc = CHILD_PROCESS_INIT;
1317
int code;
1318
struct strbuf sb = STRBUF_INIT;
1319
-
const char *hook_path = find_hook("post-rewrite");
1320
1321
if (!hook_path)
1322
return 0;
···
1614
}
1615
}
1616
1617
-
if (hook_exists("prepare-commit-msg")) {
1618
res = run_prepare_commit_msg_hook(r, msg, hook_commit);
1619
if (res)
1620
goto out;
···
5149
5150
hook_opt.path_to_stdin = rebase_path_rewritten_list();
5151
strvec_push(&hook_opt.args, "rebase");
5152
-
run_hooks_opt("post-rewrite", &hook_opt);
5153
}
5154
apply_autostash(rebase_path_autostash());
5155
···
1316
struct child_process proc = CHILD_PROCESS_INIT;
1317
int code;
1318
struct strbuf sb = STRBUF_INIT;
1319
+
const char *hook_path = find_hook(the_repository, "post-rewrite");
1320
1321
if (!hook_path)
1322
return 0;
···
1614
}
1615
}
1616
1617
+
if (hook_exists(r, "prepare-commit-msg")) {
1618
res = run_prepare_commit_msg_hook(r, msg, hook_commit);
1619
if (res)
1620
goto out;
···
5149
5150
hook_opt.path_to_stdin = rebase_path_rewritten_list();
5151
strvec_push(&hook_opt.args, "rebase");
5152
+
run_hooks_opt(r, "post-rewrite", &hook_opt);
5153
}
5154
apply_autostash(rebase_path_autostash());
5155
+1
-1
transport.c
+1
-1
transport.c