global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-09 17:46:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

transport: convert pre-push to hook API

Browse Source 
Move the pre-push hook from custom run-command invocations to
the new hook API which doesn't require a custom child_process
structure and signal toggling.

Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Emily Shaffer
2025-12-26 14:23:28 +02:00
committed by Junio C Hamano
parent 05eccff8c7
commit 3e2836a742
1 changed files with 52 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
transport.c
View File

@@ -1316,65 +1316,66 @@ static void die_with_unpushed_submodules(struct string_list *needs_pushing)
die(_("Aborting.")); die(_("Aborting."));
} }
static int run_pre_push_hook(struct transport *transport, struct feed_pre_push_hook_data {
struct ref *remote_refs)
{
int ret = 0, x;
struct ref *r;
struct child_process proc = CHILD_PROCESS_INIT;
struct strbuf buf; struct strbuf buf;
const char *hook_path = find_hook(the_repository, "pre-push"); const struct ref *refs;
};
if (!hook_path) static int pre_push_hook_feed_stdin(int hook_stdin_fd, void *pp_cb UNUSED, void *pp_task_cb)
return 0; {
struct feed_pre_push_hook_data *data = pp_task_cb;
const struct ref *r = data->refs;
int ret = 0;
strvec_push(&proc.args, hook_path); if (!r)
strvec_push(&proc.args, transport->remote->name); return 1; /* no more refs */
strvec_push(&proc.args, transport->url);
proc.in = -1; data->refs = r->next;
proc.trace2_hook_name = "pre-push";
if (start_command(&proc)) { switch (r->status) {
finish_command(&proc); case REF_STATUS_REJECT_NONFASTFORWARD:
return -1; case REF_STATUS_REJECT_REMOTE_UPDATED:
case REF_STATUS_REJECT_STALE:
case REF_STATUS_UPTODATE:
return 0; /* skip refs which won't be pushed */
default:
break;
} }
sigchain_push(SIGPIPE, SIG_IGN); if (!r->peer_ref)
return 0;
strbuf_init(&buf, 256); strbuf_reset(&data->buf);
strbuf_addf(&data->buf, "%s %s %s %s\n",
for (r = remote_refs; r; r = r->next) {
if (!r->peer_ref) continue;
if (r->status == REF_STATUS_REJECT_NONFASTFORWARD) continue;
if (r->status == REF_STATUS_REJECT_STALE) continue;
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",
r->peer_ref->name, oid_to_hex(&r->new_oid), r->peer_ref->name, oid_to_hex(&r->new_oid),
r->name, oid_to_hex(&r->old_oid)); r->name, oid_to_hex(&r->old_oid));
if (write_in_full(proc.in, buf.buf, buf.len) < 0) { ret = write_in_full(hook_stdin_fd, data->buf.buf, data->buf.len);
/* We do not mind if a hook does not read all refs. */ if (ret < 0 && errno != EPIPE)
if (errno != EPIPE) return ret; /* We do not mind if a hook does not read all refs. */
ret = -1;
break;
}
}
strbuf_release(&buf); return 0;
}
x = close(proc.in); static int run_pre_push_hook(struct transport *transport,
if (!ret) struct ref *remote_refs)
ret = x; {
struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
struct feed_pre_push_hook_data data;
int ret = 0;
sigchain_pop(SIGPIPE); strvec_push(&opt.args, transport->remote->name);
strvec_push(&opt.args, transport->url);
x = finish_command(&proc); strbuf_init(&data.buf, 0);
if (!ret) data.refs = remote_refs;
ret = x;
opt.feed_pipe = pre_push_hook_feed_stdin;
opt.feed_pipe_cb_data = &data;
ret = run_hooks_opt(the_repository, "pre-push", &opt);
strbuf_release(&data.buf);
return ret; return ret;
} }