Change incorrect uses of "remote branch" meaning "remote-tracking"

diff --git a/compat/mingw.h b/compat/mingw.h
index 47839663be4d1e861c90b0228b89385004dd5fb4..83e35e833b7f214e5d10a3e74a75fb17d80c2e13 100644 (file)
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -78,6 +78,12 @@ struct itimerval {
 };
 #define ITIMER_REAL 0
 
+/*
+ * sanitize preprocessor namespace polluted by Windows headers defining
+ * macros which collide with git local versions
+ */
+#undef HELP_COMMAND /* from winuser.h */
+
 /*
  * trivial stubs
  */
@@ -250,6 +256,8 @@ pid_t mingw_spawnvpe(const char *cmd, const char **argv, char **env,
                     int fhin, int fhout, int fherr);
 void mingw_execvp(const char *cmd, char *const *argv);
 #define execvp mingw_execvp
+void mingw_execv(const char *cmd, char *const *argv);
+#define execv mingw_execv
 
 static inline unsigned int git_ntohl(unsigned int x)
 { return (unsigned int)ntohl(x); }