From: Orgad Shaneh <orgads@xxxxxxxxx>
Used in the follow-up commit for enabling stdin for commit-related
hooks.
Signed-off-by: Orgad Shaneh <orgads@xxxxxxxxx>
---
builtin/commit.c | 8 ++++----
builtin/merge.c | 6 +++---
commit.c | 4 ++--
commit.h | 3 ++-
run-command.c | 6 +++---
run-command.h | 17 ++++++++++++-----
sequencer.c | 4 ++--
7 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index 505fe60956d..70a7842e224 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -699,7 +699,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
/* This checks and barfs if author is badly specified */
determine_author_info(author_ident);
- if (!no_verify && run_commit_hook(use_editor, index_file, "pre-commit", NULL))
+ if (!no_verify && run_commit_hook(use_editor, index_file, 0, "pre-commit", NULL))
return 0;
if (squash_message) {
@@ -998,7 +998,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
return 0;
}
- if (run_commit_hook(use_editor, index_file, "prepare-commit-msg",
+ if (run_commit_hook(use_editor, index_file, 0, "prepare-commit-msg",
git_path_commit_editmsg(), hook_arg1, hook_arg2, NULL))
return 0;
@@ -1015,7 +1015,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
}
if (!no_verify &&
- run_commit_hook(use_editor, index_file, "commit-msg", git_path_commit_editmsg(), NULL)) {
+ run_commit_hook(use_editor, index_file, 0, "commit-msg", git_path_commit_editmsg(), NULL)) {
return 0;
}
@@ -1701,7 +1701,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
repo_rerere(the_repository, 0);
run_auto_maintenance(quiet);
- run_commit_hook(use_editor, get_index_file(), "post-commit", NULL);
+ run_commit_hook(use_editor, get_index_file(), 0, "post-commit", NULL);
if (amend && !no_post_rewrite) {
commit_post_rewrite(the_repository, current_head, &oid);
}
diff --git a/builtin/merge.c b/builtin/merge.c
index 1cff7307153..26e6ae15993 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -836,7 +836,7 @@ static void prepare_to_commit(struct commit_list *remoteheads)
struct strbuf msg = STRBUF_INIT;
const char *index_file = get_index_file();
- if (!no_verify && run_commit_hook(0 < option_edit, index_file, "pre-merge-commit", NULL))
+ if (!no_verify && run_commit_hook(0 < option_edit, index_file, 0, "pre-merge-commit", NULL))
abort_commit(remoteheads, NULL);
/*
* Re-read the index as pre-merge-commit hook could have updated it,
@@ -864,7 +864,7 @@ static void prepare_to_commit(struct commit_list *remoteheads)
append_signoff(&msg, ignore_non_trailer(msg.buf, msg.len), 0);
write_merge_heads(remoteheads);
write_file_buf(git_path_merge_msg(the_repository), msg.buf, msg.len);
- if (run_commit_hook(0 < option_edit, get_index_file(), "prepare-commit-msg",
+ if (run_commit_hook(0 < option_edit, get_index_file(), 0, "prepare-commit-msg",
git_path_merge_msg(the_repository), "merge", NULL))
abort_commit(remoteheads, NULL);
if (0 < option_edit) {
@@ -873,7 +873,7 @@ static void prepare_to_commit(struct commit_list *remoteheads)
}
if (!no_verify && run_commit_hook(0 < option_edit, get_index_file(),
- "commit-msg",
+ 0, "commit-msg",
git_path_merge_msg(the_repository), NULL))
abort_commit(remoteheads, NULL);
diff --git a/commit.c b/commit.c
index fe1fa3dc41f..3f5a50164eb 100644
--- a/commit.c
+++ b/commit.c
@@ -1631,7 +1631,7 @@ size_t ignore_non_trailer(const char *buf, size_t len)
}
int run_commit_hook(int editor_is_used, const char *index_file,
- const char *name, ...)
+ unsigned flags, const char *name, ...)
{
struct strvec hook_env = STRVEC_INIT;
va_list args;
@@ -1646,7 +1646,7 @@ int run_commit_hook(int editor_is_used, const char *index_file,
strvec_push(&hook_env, "GIT_EDITOR=:");
va_start(args, name);
- ret = run_hook_ve(hook_env.v, name, args);
+ ret = run_hook_ve(hook_env.v, flags, name, args);
va_end(args);
strvec_clear(&hook_env);
diff --git a/commit.h b/commit.h
index 5467786c7be..72215d57fb2 100644
--- a/commit.h
+++ b/commit.h
@@ -352,6 +352,7 @@ int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused)
int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused);
LAST_ARG_MUST_BE_NULL
-int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...);
+int run_commit_hook(int editor_is_used, const char *index_file, unsigned flags,
+ const char *name, ...);
#endif /* COMMIT_H */
diff --git a/run-command.c b/run-command.c
index ea4d0fb4b15..30d69562f43 100644
--- a/run-command.c
+++ b/run-command.c
@@ -1344,7 +1344,7 @@ const char *find_hook(const char *name)
return path.buf;
}
-int run_hook_ve(const char *const *env, const char *name, va_list args)
+int run_hook_ve(const char *const *env, unsigned flags, const char *name, va_list args)
{
struct child_process hook = CHILD_PROCESS_INIT;
const char *p;
@@ -1357,7 +1357,7 @@ int run_hook_ve(const char *const *env, const char *name, va_list args)
while ((p = va_arg(args, const char *)))
strvec_push(&hook.args, p);
hook.env = env;
- hook.no_stdin = 1;
+ hook.no_stdin = !(flags & RUN_HOOK_ALLOW_STDIN);
hook.stdout_to_stderr = 1;
hook.trace2_hook_name = name;
@@ -1370,7 +1370,7 @@ int run_hook_le(const char *const *env, const char *name, ...)
int ret;
va_start(args, name);
- ret = run_hook_ve(env, name, args);
+ ret = run_hook_ve(env, 0, name, args);
va_end(args);
return ret;
diff --git a/run-command.h b/run-command.h
index 6472b38bde4..e613e5e3f92 100644
--- a/run-command.h
+++ b/run-command.h
@@ -201,22 +201,29 @@ int run_command(struct child_process *);
*/
const char *find_hook(const char *name);
+#define RUN_HOOK_ALLOW_STDIN 1
+
/**
* Run a hook.
- * The first argument is a pathname to an index file, or NULL
- * if the hook uses the default index file or no index is needed.
- * The second argument is the name of the hook.
+ * The env argument is an array of environment variables, or NULL
+ * if the hook uses the default environment and doesn't require
+ * additional variables.
+ * The flags argument is an OR'ed collection of feature bits like
+ * RUN_HOOK_ALLOW_STDIN defined above, which enables
+ * stdin for the child process (the default is no_stdin).
+ * The name argument is the name of the hook.
* The further arguments correspond to the hook arguments.
* The last argument has to be NULL to terminate the arguments list.
* If the hook does not exist or is not executable, the return
* value will be zero.
* If it is executable, the hook will be executed and the exit
* status of the hook is returned.
- * On execution, .stdout_to_stderr and .no_stdin will be set.
+ * On execution, .stdout_to_stderr will be set, and .no_stdin will be
+ * set unless RUN_HOOK_ALLOW_STDIN flag is requested.
*/
LAST_ARG_MUST_BE_NULL
int run_hook_le(const char *const *env, const char *name, ...);
-int run_hook_ve(const char *const *env, const char *name, va_list args);
+int run_hook_ve(const char *const *env, unsigned flags, const char *name, va_list args);
/*
* Trigger an auto-gc
diff --git a/sequencer.c b/sequencer.c
index 8909a467700..5f48d32e2fa 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -1203,7 +1203,7 @@ static int run_prepare_commit_msg_hook(struct repository *r,
} else {
arg1 = "message";
}
- if (run_commit_hook(0, r->index_file, "prepare-commit-msg", name,
+ if (run_commit_hook(0, r->index_file, 0, "prepare-commit-msg", name,
arg1, arg2, NULL))
ret = error(_("'prepare-commit-msg' hook failed"));
@@ -1528,7 +1528,7 @@ static int try_to_commit(struct repository *r,
goto out;
}
- run_commit_hook(0, r->index_file, "post-commit", NULL);
+ run_commit_hook(0, r->index_file, 0, "post-commit", NULL);
if (flags & AMEND_MSG)
commit_post_rewrite(r, current_head, oid);
--
gitgitgadget
