Merge branch 'po/rerere-doc-fmt'

diff --git a/git-compat-util.h b/git-compat-util.h
index 6573808ebd991b52eca7cc644af4c9611b9c3747..31b47932bd5144f306a9aa1b122fdf3cb0886284 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -1259,6 +1259,13 @@ static inline int is_missing_file_error(int errno_)
 
 extern int cmd_main(int, const char **);
 
+/*
+ * Intercept all calls to exit() and route them to trace2 to
+ * optionally emit a message before calling the real exit().
+ */
+int trace2_cmd_exit_fl(const char *file, int line, int code);
+#define exit(code) exit(trace2_cmd_exit_fl(__FILE__, __LINE__, (code)))
+
 /*
  * You can mark a stack variable with UNLEAK(var) to avoid it being
  * reported as a leak by tools like LSAN or valgrind. The argument