Merge branch 'maint' of git://github.com/git-l10n/git-po into maint

diff --git a/run-command.h b/run-command.h
index 263b9662adeba011adcd018f77b7ccbbcd53e94a..275d35c442ac575f8f3f40aeb915cd0d341c776f 100644 (file)
--- a/run-command.h
+++ b/run-command.h
@@ -50,9 +50,15 @@ 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 *);
 
-extern char *find_hook(const char *name);
+/*
+ * 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, ...);
 extern int run_hook_ve(const char *const *env, const char *name, va_list args);