Merge branch 'en/fetch-negotiation-default-fix'

[thirdparty/git.git] / run-command.c

diff --git a/run-command.c b/run-command.c
index 3ea2c2fc101ffe7ab2d6bc4cee72e2b2efeba5dd..a8501e38cebe50f6a1fefb6d31d92ce049b96ac3 100644 (file)
--- a/run-command.c
+++ b/run-command.c
@@ -340,15 +340,6 @@ static void child_close_pair(int fd[2])
        child_close(fd[1]);
 }
 
-/*
- * parent will make it look like the child spewed a fatal error and died
- * this is needed to prevent changes to t0061.
- */
-static void fake_fatal(const char *err, va_list params)
-{
-       vreportf("fatal: ", err, params);
-}
-
 static void child_error_fn(const char *err, va_list params)
 {
        const char msg[] = "error() should not be called in child\n";
@@ -372,9 +363,10 @@ static void NORETURN child_die_fn(const char *err, va_list params)
 static void child_err_spew(struct child_process *cmd, struct child_err *cerr)
 {
        static void (*old_errfn)(const char *err, va_list params);
+       report_fn die_message_routine = get_die_message_routine();
 
        old_errfn = get_error_routine();
-       set_error_routine(fake_fatal);
+       set_error_routine(die_message_routine);
        errno = cerr->syserr;
 
        switch (cerr->err) {
@@ -1072,7 +1064,9 @@ static void *run_thread(void *data)
 
 static NORETURN void die_async(const char *err, va_list params)
 {
-       vreportf("fatal: ", err, params);
+       report_fn die_message_fn = get_die_message_routine();
+
+       die_message_fn(err, params);
 
        if (in_async()) {
                struct async *async = pthread_getspecific(async_key);
@@ -1313,39 +1307,6 @@ int async_with_fork(void)
 #endif
 }
 
-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;