run-command: remove old run_hook_{le,ve}() hook API

The new hook.h library has replaced all run-command.h hook-related
functionality. So let's delete this dead code.

Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Acked-by: Emily Shaffer <emilyshaffer@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/run-command.c b/run-command.c
index ea09de040a77d3df76c65614625f48334e4f3477..f32e4fe1326649df7007ff1f8a1dd3b725276a6d 100644 (file)
--- a/run-command.c
+++ b/run-command.c
@@ -1313,39 +1313,6 @@ int async_with_fork(void)
 #endif
 }
 
-static int run_hook_ve(const char *const *env, const char *name, va_list args)
-{
-       struct child_process hook = CHILD_PROCESS_INIT;
-       const char *p;
-
-       p = find_hook(name);
-       if (!p)
-               return 0;
-
-       strvec_push(&hook.args, p);
-       while ((p = va_arg(args, const char *)))
-               strvec_push(&hook.args, p);
-       if (env)
-               strvec_pushv(&hook.env_array, (const char **)env);
-       hook.no_stdin = 1;
-       hook.stdout_to_stderr = 1;
-       hook.trace2_hook_name = name;
-
-       return run_command(&hook);
-}
-
-int run_hook_le(const char *const *env, const char *name, ...)
-{
-       va_list args;
-       int ret;
-
-       va_start(args, name);
-       ret = run_hook_ve(env, name, args);
-       va_end(args);
-
-       return ret;
-}
-
 struct io_pump {
        /* initialized by caller */
        int fd;

diff --git a/run-command.h b/run-command.h
index 88a398c300aa6a14acb02c7b61caeaf1636ca935..07bed6c31b4e9f065b9ae0a4490cfd56adada0c7 100644 (file)
--- a/run-command.h
+++ b/run-command.h
@@ -220,22 +220,6 @@ int finish_command_in_signal(struct child_process *);
  */
 int run_command(struct child_process *);
 
-/**
- * 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 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.
- */
-LAST_ARG_MUST_BE_NULL
-int run_hook_le(const char *const *env, const char *name, ...);
-
 /*
  * Trigger an auto-gc
  */