Merge branch 'maint-1.8.1' into maint-1.8.2

diff --git a/git-compat-util.h b/git-compat-util.h
index e715285e7c2e0a3d0b959505921b344dda55089d..ad4762499ef66336ed8a7ac17cf0a6cb36da5d15 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -327,6 +327,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);