On Tue, Sep 01, 2015 at 04:22:43PM -0400, Jeff King wrote:
> diff --git a/run-command.c b/run-command.c
> index 3277cf7..c8029f2 100644
> --- a/run-command.c
> +++ b/run-command.c
This diff is a little funny to read because the interesting context is
far away, and it is not immediately obvious why we are defining the
function twice. This:
> @@ -595,7 +595,7 @@ static NORETURN void die_async(const char *err, va_list params)
> {
> vreportf("fatal: ", err, params);
>
> - if (!pthread_equal(main_thread, pthread_self())) {
> + if (in_async()) {
> struct async *async = pthread_getspecific(async_key);
> if (async->proc_in >= 0)
> close(async->proc_in);
> @@ -614,6 +614,13 @@ static int async_die_is_recursing(void)
> return ret != NULL;
> }
>
> +int in_async(void)
> +{
> + if (!main_thread_set)
> + return 0; /* no asyncs started yet */
> + return !pthread_equal(main_thread, pthread_self());
> +}
> +
> #else
is all inside #ifndef NO_PTHREADS, and this:
> @@ -653,6 +660,12 @@ int git_atexit(void (*handler)(void))
> }
> #define atexit git_atexit
>
> +static int process_is_async;
> +int in_async(void)
> +{
> + return process_is_async;
> +}
> +
> #endif
is the "#else" case where we fork.
-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html