By using the hook.h:run_hooks API, pre-push hooks can be specified in
the config as well as in the hookdir.
Signed-off-by: Emily Shaffer <emilyshaffer@xxxxxxxxxx>
---
Documentation/githooks.txt | 2 ++
transport.c | 55 +++++++++-----------------------------
2 files changed, 14 insertions(+), 43 deletions(-)
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index db290984f6..8f5524055b 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -271,6 +271,8 @@ If this hook exits with a non-zero status, `git push` will abort without
pushing anything. Information about why the push is rejected may be sent
to the user by writing to standard error.
+Hooks executed during 'pre-push' will run in parallel by default.
+
[[pre-receive]]
pre-receive
~~~~~~~~~~~
diff --git a/transport.c b/transport.c
index 47da955e4f..6c67bc0fea 100644
--- a/transport.c
+++ b/transport.c
@@ -22,6 +22,7 @@
#include "protocol.h"
#include "object-store.h"
#include "color.h"
+#include "hook.h"
static int transport_use_color = -1;
static char transport_colors[][COLOR_MAXLEN] = {
@@ -1162,31 +1163,13 @@ static void die_with_unpushed_submodules(struct string_list *needs_pushing)
static int run_pre_push_hook(struct transport *transport,
struct ref *remote_refs)
{
- int ret = 0, x;
+ int ret = 0;
+ struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT_ASYNC;
+ struct strbuf tmp = STRBUF_INIT;
struct ref *r;
- struct child_process proc = CHILD_PROCESS_INIT;
- struct strbuf buf;
- const char *argv[4];
-
- if (!(argv[0] = find_hook("pre-push")))
- return 0;
-
- argv[1] = transport->remote->name;
- argv[2] = transport->url;
- argv[3] = NULL;
-
- proc.argv = argv;
- proc.in = -1;
- proc.trace2_hook_name = "pre-push";
-
- if (start_command(&proc)) {
- finish_command(&proc);
- return -1;
- }
- sigchain_push(SIGPIPE, SIG_IGN);
-
- strbuf_init(&buf, 256);
+ strvec_push(&opt.args, transport->remote->name);
+ strvec_push(&opt.args, transport->url);
for (r = remote_refs; r; r = r->next) {
if (!r->peer_ref) continue;
@@ -1195,30 +1178,16 @@ static int run_pre_push_hook(struct transport *transport,
if (r->status == REF_STATUS_REJECT_REMOTE_UPDATED) continue;
if (r->status == REF_STATUS_UPTODATE) continue;
- strbuf_reset(&buf);
- strbuf_addf( &buf, "%s %s %s %s\n",
+ strbuf_reset(&tmp);
+ strbuf_addf(&tmp, "%s %s %s %s",
r->peer_ref->name, oid_to_hex(&r->new_oid),
r->name, oid_to_hex(&r->old_oid));
-
- if (write_in_full(proc.in, buf.buf, buf.len) < 0) {
- /* We do not mind if a hook does not read all refs. */
- if (errno != EPIPE)
- ret = -1;
- break;
- }
+ string_list_append(&opt.str_stdin, tmp.buf);
}
- strbuf_release(&buf);
-
- x = close(proc.in);
- if (!ret)
- ret = x;
-
- sigchain_pop(SIGPIPE);
-
- x = finish_command(&proc);
- if (!ret)
- ret = x;
+ ret = run_hooks("pre-push", &opt);
+ run_hooks_opt_clear(&opt);
+ strbuf_release(&tmp);
return ret;
}
--
2.28.0.rc0.142.g3c755180ce-goog
