From: Josh Steadmon <steadmon@google.com>
To: Emily Shaffer <emilyshaffer@google.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 10/17] hook: convert 'post-rewrite' hook to config
Date: Tue, 8 Dec 2020 15:02:13 -0800 [thread overview]
Message-ID: <20201208230213.GM36751@google.com> (raw)
In-Reply-To: <20201205014945.1502660-11-emilyshaffer@google.com>
On 2020.12.04 17:49, Emily Shaffer wrote:
> diff --git a/sequencer.c b/sequencer.c
> index 5a98fd2fbc..4befd862ff 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -35,6 +35,7 @@
> #include "rebase-interactive.h"
> #include "reset.h"
> #include "hook.h"
> +#include "string-list.h"
>
> #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
>
> @@ -1143,33 +1144,23 @@ int update_head_with_reflog(const struct commit *old_head,
> static int run_rewrite_hook(const struct object_id *oldoid,
> const struct object_id *newoid)
> {
> - struct child_process proc = CHILD_PROCESS_INIT;
> - const char *argv[3];
> + struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT_ASYNC;
> + struct strbuf tmp = STRBUF_INIT;
> int code;
> - struct strbuf sb = STRBUF_INIT;
>
> - argv[0] = find_hook("post-rewrite");
> - if (!argv[0])
> - return 0;
> + strvec_push(&opt.args, "amend");
>
> - argv[1] = "amend";
> - argv[2] = NULL;
> -
> - proc.argv = argv;
> - proc.in = -1;
> - proc.stdout_to_stderr = 1;
> - proc.trace2_hook_name = "post-rewrite";
> -
> - code = start_command(&proc);
> - if (code)
> - return code;
> - strbuf_addf(&sb, "%s %s\n", oid_to_hex(oldoid), oid_to_hex(newoid));
> - sigchain_push(SIGPIPE, SIG_IGN);
Here and in a few other later patches, we're removing some signal
handling that doesn't seem to be replicated in the run_hooks()
implementation. Can you add a note to the commit message about why this
is OK?
> - write_in_full(proc.in, sb.buf, sb.len);
> - close(proc.in);
> - strbuf_release(&sb);
> - sigchain_pop(SIGPIPE);
> - return finish_command(&proc);
> + strbuf_addf(&tmp,
> + "%s %s",
> + oid_to_hex(oldoid),
> + oid_to_hex(newoid));
> + string_list_append(&opt.str_stdin, tmp.buf);
> +
> + code = run_hooks("post-rewrite", &opt);
> +
> + run_hooks_opt_clear(&opt);
> + strbuf_release(&tmp);
> + return code;
> }
>
> void commit_post_rewrite(struct repository *r,
> @@ -4317,30 +4308,21 @@ static int pick_commits(struct repository *r,
> flush_rewritten_pending();
> if (!stat(rebase_path_rewritten_list(), &st) &&
> st.st_size > 0) {
> - struct child_process child = CHILD_PROCESS_INIT;
> - const char *post_rewrite_hook =
> - find_hook("post-rewrite");
> -
> - child.in = open(rebase_path_rewritten_list(), O_RDONLY);
> - child.git_cmd = 1;
> - strvec_push(&child.args, "notes");
> - strvec_push(&child.args, "copy");
> - strvec_push(&child.args, "--for-rewrite=rebase");
> + struct child_process notes_cp = CHILD_PROCESS_INIT;
> + struct run_hooks_opt hook_opt = RUN_HOOKS_OPT_INIT_ASYNC;
> +
> + notes_cp.in = open(rebase_path_rewritten_list(), O_RDONLY);
> + notes_cp.git_cmd = 1;
> + strvec_push(¬es_cp.args, "notes");
> + strvec_push(¬es_cp.args, "copy");
> + strvec_push(¬es_cp.args, "--for-rewrite=rebase");
> /* we don't care if this copying failed */
> - run_command(&child);
> -
> - if (post_rewrite_hook) {
> - struct child_process hook = CHILD_PROCESS_INIT;
> -
> - hook.in = open(rebase_path_rewritten_list(),
> - O_RDONLY);
> - hook.stdout_to_stderr = 1;
> - hook.trace2_hook_name = "post-rewrite";
> - strvec_push(&hook.args, post_rewrite_hook);
> - strvec_push(&hook.args, "rebase");
> - /* we don't care if this hook failed */
> - run_command(&hook);
> - }
> + run_command(¬es_cp);
> +
> + hook_opt.path_to_stdin = rebase_path_rewritten_list();
> + strvec_push(&hook_opt.args, "rebase");
> + run_hooks("post-rewrite", &hook_opt);
> + run_hooks_opt_clear(&hook_opt);
> }
> apply_autostash(rebase_path_autostash());
>
> --
> 2.28.0.rc0.142.g3c755180ce-goog
>
next prev parent reply other threads:[~2020-12-08 23:04 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-14 23:25 [PATCH] commit: use config-based hooks (config-based hooks part II) Emily Shaffer
2020-10-16 18:34 ` Junio C Hamano
2020-12-05 1:49 ` [PATCH 00/17] use config-based hooks (config-based hooks part Emily Shaffer
2020-12-05 1:49 ` [PATCH 01/17] commit: use config-based hooks Emily Shaffer
2020-12-05 1:49 ` [PATCH 02/17] am: convert applypatch hooks to use config Emily Shaffer
2020-12-05 1:49 ` [PATCH 03/17] merge: use config-based hooks for post-merge hook Emily Shaffer
2020-12-05 1:49 ` [PATCH 04/17] gc: use hook library for pre-auto-gc hook Emily Shaffer
2020-12-05 1:49 ` [PATCH 05/17] rebase: teach pre-rebase to use hook.h Emily Shaffer
2020-12-05 1:49 ` [PATCH 06/17] read-cache: convert post-index-change hook to use config Emily Shaffer
2020-12-05 1:49 ` [PATCH 07/17] receive-pack: convert push-to-checkout hook to hook.h Emily Shaffer
2020-12-05 1:49 ` [PATCH 08/17] git-p4: use 'git hook' to run hooks Emily Shaffer
2020-12-16 0:27 ` Josh Steadmon
2020-12-16 20:19 ` Emily Shaffer
2020-12-05 1:49 ` [PATCH 09/17] hooks: convert 'post-checkout' hook to hook library Emily Shaffer
2020-12-05 1:49 ` [PATCH 10/17] hook: convert 'post-rewrite' hook to config Emily Shaffer
2020-12-08 23:02 ` Josh Steadmon [this message]
2020-12-15 23:42 ` Emily Shaffer
2020-12-05 1:49 ` [PATCH 11/17] transport: convert pre-push hook to use config Emily Shaffer
2020-12-05 1:49 ` [PATCH 12/17] reference-transaction: look for hooks in config Emily Shaffer
2020-12-05 1:49 ` [PATCH 13/17] receive-pack: convert 'update' hook to hook.h Emily Shaffer
2020-12-05 1:49 ` [PATCH 14/17] proc-receive: acquire hook list from hook.h Emily Shaffer
2020-12-05 1:49 ` [PATCH 15/17] post-update: use hook.h library Emily Shaffer
2020-12-05 1:49 ` [PATCH 16/17] receive-pack: convert receive hooks to hook.h Emily Shaffer
2020-12-05 1:49 ` [PATCH 17/17] run-command: stop thinking about hooks Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 00/17] use config-based hooks (config-based hooks part II) Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 01/17] commit: use config-based hooks Emily Shaffer
2021-02-01 22:08 ` Junio C Hamano
2021-03-10 19:51 ` Emily Shaffer
2021-03-10 22:36 ` Junio C Hamano
2021-02-01 23:02 ` Junio C Hamano
2021-03-10 19:39 ` Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 02/17] am: convert applypatch hooks to use config Emily Shaffer
2021-02-01 22:05 ` Junio C Hamano
2020-12-22 0:04 ` [PATCH v3 03/17] merge: use config-based hooks for post-merge hook Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 04/17] gc: use hook library for pre-auto-gc hook Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 05/17] rebase: teach pre-rebase to use hook.h Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 06/17] read-cache: convert post-index-change hook to use config Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 07/17] receive-pack: convert push-to-checkout hook to hook.h Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 08/17] git-p4: use 'git hook' to run hooks Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 09/17] hooks: convert 'post-checkout' hook to hook library Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 10/17] hook: convert 'post-rewrite' hook to config Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 11/17] transport: convert pre-push hook to use config Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 12/17] reference-transaction: look for hooks in config Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 13/17] receive-pack: convert 'update' hook to hook.h Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 14/17] proc-receive: acquire hook list from hook.h Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 15/17] post-update: use hook.h library Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 16/17] receive-pack: convert receive hooks to hook.h Emily Shaffer
2020-12-22 0:04 ` [PATCH v3 17/17] run-command: stop thinking about hooks Emily Shaffer
2020-12-28 19:59 ` [PATCH v3 00/17] use config-based hooks (config-based hooks part II) Emily Shaffer
2020-12-28 22:40 ` [PATCH v3 18/17] doc: make git-hook.txt point of truth Emily Shaffer
2020-12-28 23:15 ` Emily Shaffer
2021-02-18 22:32 ` [PATCH v3 00/17] use config-based hooks (config-based hooks part II) Josh Steadmon
2020-12-16 0:31 ` [PATCH] commit: " Josh Steadmon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201208230213.GM36751@google.com \
--to=steadmon@google.com \
--cc=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).