Merge branch 'fk/blame' into next

diff --git a/git-compat-util.h b/git-compat-util.h
index 12ce6590bb926de2d27eee9520dd2017dd34554e..f982b8e48469a5f09698808d1e55ded04d5923b8 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -63,6 +63,11 @@ extern int gitfakemunmap(void *start, size_t length);
 extern int gitsetenv(const char *, const char *, int);
 #endif
 
+#ifdef NO_UNSETENV
+#define unsetenv gitunsetenv
+extern void gitunsetenv(const char *);
+#endif
+
 #ifdef NO_STRCASESTR
 #define strcasestr gitstrcasestr
 extern char *gitstrcasestr(const char *haystack, const char *needle);