Merge branch 'tk/typofix-connect-unknown-proto-error'

diff --git a/run-command.h b/run-command.h
index 1103805af1b01e8396de15f48fbd06f75313fb0d..5428b048e2c49dec3e322ac2a46ffddd012e4c8d 100644 (file)
--- a/run-command.h
+++ b/run-command.h
@@ -50,8 +50,14 @@ void child_process_init(struct child_process *);
 
 int start_command(struct child_process *);
 int finish_command(struct child_process *);
+int finish_command_in_signal(struct child_process *);
 int run_command(struct child_process *);
 
+/*
+ * Returns the path to the hook file, or NULL if the hook is missing
+ * or disabled. Note that this points to static storage that will be
+ * overwritten by further calls to find_hook and run_hook_*.
+ */
 extern const char *find_hook(const char *name);
 LAST_ARG_MUST_BE_NULL
 extern int run_hook_le(const char *const *env, const char *name, ...);
@@ -113,5 +119,6 @@ struct async {
 
 int start_async(struct async *async);
 int finish_async(struct async *async);
+int in_async(void);
 
 #endif