Merge branch 'bc/checkout-tracking-name-plug-leak'

diff --git a/compat/cygwin.c b/compat/cygwin.c
index 871b41d23a7471724a0446ff3333b577a175c579..91ce5d4c7ad2c04abbcbbf146f3123867fd4d1bb 100644 (file)
--- a/compat/cygwin.c
+++ b/compat/cygwin.c
@@ -1,14 +1,9 @@
 #define CYGWIN_C
 #define WIN32_LEAN_AND_MEAN
-#ifdef CYGWIN_V15_WIN32API
-#include "../git-compat-util.h"
-#include "win32.h"
-#else
 #include <sys/stat.h>
 #include <sys/errno.h>
 #include "win32.h"
 #include "../git-compat-util.h"
-#endif
 #include "../cache.h" /* to read configuration */
 
 /*