Merge branch 'ds/push-squelch-ambig-warning'

diff --git a/run-command.c b/run-command.c
index d679cc267c39b9fb34f57078db5db12ed591b7e2..c11ff8067481f70c444198bcc7477ef744d99fd3 100644 (file)
--- a/run-command.c
+++ b/run-command.c
@@ -1226,7 +1226,7 @@ int start_async(struct async *async)
        {
                int err = pthread_create(&async->tid, NULL, run_thread, async);
                if (err) {
-                       error_errno("cannot create thread");
+                       error(_("cannot create async thread: %s"), strerror(err));
                        goto error;
                }
        }
@@ -1259,6 +1259,15 @@ int finish_async(struct async *async)
 #endif
 }
 
+int async_with_fork(void)
+{
+#ifdef NO_PTHREADS
+       return 1;
+#else
+       return 0;
+#endif
+}
+
 const char *find_hook(const char *name)
 {
        static struct strbuf path = STRBUF_INIT;