From 6cfef43abe77633e8e42389747d406fae87a91f2 Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Mon, 21 Jul 2008 11:17:26 +0200 Subject: [PATCH 1/2] Revert "Windows: set gitexecdir = $(bindir)" This reverts commit e0e7163c215a6e74940cc1b66c7f4461359a7dc1. --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 5e3d48183c..b01cf1c993 100644 --- a/Makefile +++ b/Makefile @@ -745,7 +745,6 @@ 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 From 01d9b2d0d678204761b2869b5f9ab28f26674fec Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Sat, 26 Jul 2008 23:04:41 +0200 Subject: [PATCH 2/2] Fix t5602-clone-remote-exec on MSYS MSYS rewrites /something/bin/... into a Windows path that is somewhere inside the MSYS installation directory. We make the path relative so that this rewriting is not triggered. Signed-off-by: Johannes Sixt --- t/t5602-clone-remote-exec.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t5602-clone-remote-exec.sh b/t/t5602-clone-remote-exec.sh index 8367a6845f..ce64449c0b 100755 --- a/t/t5602-clone-remote-exec.sh +++ b/t/t5602-clone-remote-exec.sh @@ -18,8 +18,8 @@ test_expect_success 'clone calls git-upload-pack unqualified with no -u option' ' test_expect_success 'clone calls specified git-upload-pack with -u option' ' - GIT_SSH=./not_ssh git clone -u /something/bin/git-upload-pack localhost:/path/to/repo junk - echo "localhost /something/bin/git-upload-pack '\''/path/to/repo'\''" >expected + GIT_SSH=./not_ssh git clone -u ./something/bin/git-upload-pack localhost:/path/to/repo junk + echo "localhost ./something/bin/git-upload-pack '\''/path/to/repo'\''" >expected test_cmp expected not_ssh_output '