Merge branch 'jk/receive-pack-deadlocks-with-early-failure'

diff --git a/git-compat-util.h b/git-compat-util.h
index 90e037203879f6ba91403ae5371f18910206b580..e955bb5e8b3101cc8c753cf541beabf5cd037b39 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -163,6 +163,7 @@
 typedef long intptr_t;
 typedef unsigned long uintptr_t;
 #endif
+int get_st_mode_bits(const char *path, int *mode);
 #if defined(__CYGWIN__)
 #undef _XOPEN_SOURCE
 #include <grp.h>
@@ -330,6 +331,7 @@ extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2)))
 
 extern void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params));
 extern void set_error_routine(void (*routine)(const char *err, va_list params));
+extern void set_die_is_recursing_routine(int (*routine)(void));
 
 extern int prefixcmp(const char *str, const char *prefix);
 extern int suffixcmp(const char *str, const char *suffix);