Merge branch 'tb/filter-alternate-refs'

diff --git a/compat/mingw.h b/compat/mingw.h
index 571019d0bddceaf3245e15dbcc4ebfb70a501d17..f31dcff2be1d60ce4f5ae46089d59255f1bc4dff 100644 (file)
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -424,6 +424,8 @@ static inline void convert_slashes(char *path)
 int mingw_offset_1st_component(const char *path);
 #define offset_1st_component mingw_offset_1st_component
 #define PATH_SEP ';'
+extern char *mingw_query_user_email(void);
+#define query_user_email mingw_query_user_email
 #if !defined(__MINGW64_VERSION_MAJOR) && (!defined(_MSC_VER) || _MSC_VER < 1800)
 #define PRIuMAX "I64u"
 #define PRId64 "I64d"