Some hooks (such as post-rewrite) need to take input via stdin.
Previously, callers provided stdin to hooks by setting
run-command.h:child_process.in, which takes a FD. Callers would open the
file in question themselves before calling run-command(). However, since
we will now need to seek to the front of the file and read it again for
every hook which runs, hook.h:run_command() takes a path and handles FD
management itself. Since this file is opened for read only, it should
not prevent later parallel execution support.
On the frontend, this is supported by asking for a file path, rather
than by reading stdin. Reading directly from stdin would involve caching
the entire stdin (to memory or to disk) and reading it back from the
beginning to each hook. We'd want to support cases like insufficient
memory or storage for the file. While this may prove useful later, for
now the path of least resistance is to just ask the user to make this
interim file themselves.
Signed-off-by: Emily Shaffer <emilyshaffer@xxxxxxxxxx>
---
Documentation/git-hook.txt | 11 +++++++++--
builtin/hook.c | 5 ++++-
hook.c | 7 ++++++-
hook.h | 9 +++++++--
t/t1360-config-based-hooks.sh | 24 ++++++++++++++++++++++++
5 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-hook.txt b/Documentation/git-hook.txt
index 18a817d832..cce30a80d0 100644
--- a/Documentation/git-hook.txt
+++ b/Documentation/git-hook.txt
@@ -9,7 +9,8 @@ SYNOPSIS
--------
[verse]
'git hook' list <hook-name>
-'git hook' run [(-e|--env)=<var>...] [(-a|--arg)=<arg>...] <hook-name>
+'git hook' run [(-e|--env)=<var>...] [(-a|--arg)=<arg>...] [--to-stdin=<path>]
+ <hook-name>
DESCRIPTION
-----------
@@ -65,7 +66,7 @@ in the order they should be run, and print the config scope where the relevant
`hook.<hook-name>.command` was specified, not the `hookcmd` (if applicable).
This output is human-readable and the format is subject to change over time.
-run [(-e|--env)=<var>...] [(-a|--arg)=<arg>...] `<hook-name>`::
+run [(-e|--env)=<var>...] [(-a|--arg)=<arg>...] [--to-stdin=<path>] `<hook-name>`::
Runs hooks configured for `<hook-name>`, in the same order displayed by `git
hook list`. Hooks configured this way are run prepended with `sh -c`, so paths
@@ -91,6 +92,12 @@ Specify arguments to pass to every hook that is run.
+
Specify environment variables to set for every hook that is run.
+--to-stdin::
+ Only valid for `run`.
++
+Specify a file which will be streamed into stdin for every hook that is run.
+Each hook will receive the entire file from beginning to EOF.
+
CONFIGURATION
-------------
include::config/hook.txt[]
diff --git a/builtin/hook.c b/builtin/hook.c
index 07ba00e07a..be104f2938 100644
--- a/builtin/hook.c
+++ b/builtin/hook.c
@@ -9,7 +9,8 @@
static const char * const builtin_hook_usage[] = {
N_("git hook list <hookname>"),
- N_("git hook run [(-e|--env)=<var>...] [(-a|--arg)=<arg>...] <hookname>"),
+ N_("git hook run [(-e|--env)=<var>...] [(-a|--arg)=<arg>...]"
+ "[--to-stdin=<path>] <hookname>"),
NULL
};
@@ -97,6 +98,8 @@ static int run(int argc, const char **argv, const char *prefix)
N_("environment variables for hook to use")),
OPT_STRVEC('a', "arg", &opt.args, N_("args"),
N_("argument to pass to hook")),
+ OPT_STRING(0, "to-stdin", &opt.path_to_stdin, N_("path"),
+ N_("file to read into hooks' stdin")),
OPT_END(),
};
diff --git a/hook.c b/hook.c
index fbb69706d8..ce5c443206 100644
--- a/hook.c
+++ b/hook.c
@@ -263,8 +263,13 @@ int run_hooks(const char *hookname, struct run_hooks_opt *options)
struct child_process hook_proc = CHILD_PROCESS_INIT;
struct hook *hook = list_entry(pos, struct hook, list);
+ /* reopen the file for stdin; run_command closes it. */
+ if (options->path_to_stdin)
+ hook_proc.in = xopen(options->path_to_stdin, O_RDONLY);
+ else
+ hook_proc.no_stdin = 1;
+
hook_proc.env = options->env.v;
- hook_proc.no_stdin = 1;
hook_proc.stdout_to_stderr = 1;
hook_proc.trace2_hook_name = hook->command.buf;
hook_proc.use_shell = 1;
diff --git a/hook.h b/hook.h
index 762b6fadad..e22a6db832 100644
--- a/hook.h
+++ b/hook.h
@@ -51,11 +51,15 @@ struct run_hooks_opt
* to be overridden if the user can override it at the command line.
*/
enum hookdir_opt run_hookdir;
+
+ /* Path to file which should be piped to stdin for each hook */
+ const char *path_to_stdin;
};
#define RUN_HOOKS_OPT_INIT { \
- .env = STRVEC_INIT, \
+ .env = STRVEC_INIT, \
.args = STRVEC_INIT, \
+ .path_to_stdin = NULL, \
.run_hookdir = configured_hookdir_opt() \
}
@@ -73,7 +77,8 @@ int hook_exists(const char *hookname, enum hookdir_opt should_run_hookdir);
/*
* Runs all hooks associated to the 'hookname' event in order. Each hook will be
- * passed 'env' and 'args'.
+ * passed 'env' and 'args'. The file at 'stdin_path' will be closed and reopened
+ * for each hook that runs.
*/
int run_hooks(const char *hookname, struct run_hooks_opt *options);
diff --git a/t/t1360-config-based-hooks.sh b/t/t1360-config-based-hooks.sh
index 5b3003d59b..c672269ee4 100755
--- a/t/t1360-config-based-hooks.sh
+++ b/t/t1360-config-based-hooks.sh
@@ -229,4 +229,28 @@ test_expect_success 'out-of-repo runs excluded' '
nongit test_must_fail git hook run pre-commit
'
+test_expect_success 'stdin to multiple hooks' '
+ git config --add hook.test.command "xargs -P1 -I% echo a%" &&
+ git config --add hook.test.command "xargs -P1 -I% echo b%" &&
+ test_when_finished "test_unconfig hook.test.command" &&
+
+ cat >input <<-EOF &&
+ 1
+ 2
+ 3
+ EOF
+
+ cat >expected <<-EOF &&
+ a1
+ a2
+ a3
+ b1
+ b2
+ b3
+ EOF
+
+ git hook run --to-stdin=input test 2>actual &&
+ test_cmp expected actual
+'
+
test_done
--
2.28.0.rc0.142.g3c755180ce-goog
