The "dash-less" change aims to remove git commands from $PATH. It does so by defining a GIT_EXEC_PATH that is different from $(bindir). On Windows we want a relocatable installation of the git tool, so we cannot use an absolute GIT_EXEC_PATH. Therefore, the implementation of builtin_exec_path() on Windows derives the exec-path from the command invocation, and disregards GIT_EXEC_PATH. But this broke when $(gitexecdir) became different from $(bindir), so we restore the earlier behavior here. This counteracts the aims of the "dash-less" change on Windows, but better this way than having no working git at all. Signed-off-by: Johannes Sixt <johannes.sixt@xxxxxxxxxx> --- Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 36339d3..7d466b3 100644 --- a/Makefile +++ b/Makefile @@ -742,6 +742,7 @@ ifneq (,$(findstring MINGW,$(uname_S))) COMPAT_OBJS += compat/mingw.o compat/fnmatch.o compat/regex.o compat/winansi.o EXTLIBS += -lws2_32 X = .exe + gitexecdir = $(bindir) template_dir = ../share/git-core/templates/ ETC_GITCONFIG = ../etc/gitconfig endif -- 1.5.6.1.275.g0a3e0f -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
