From 4a8b9dd02836946668fed2a0cf16a4825ea544d6 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 30 Jul 2009 01:46:05 +0200 Subject: [PATCH] Git installer: do not delete bin\git.exe blindly Since 1.6.4, Git installs git.exe into libexec/git-core/. But it was the Git for Windows installer's idea that no files should exist in both bin/ and libexec/git-core/. Unfortunately, it therefore killed bin/git.exe. Signed-off-by: Johannes Schindelin --- share/WinGit/install.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/WinGit/install.iss b/share/WinGit/install.iss index 00b3e4cd..9a68340c 100644 --- a/share/WinGit/install.iss +++ b/share/WinGit/install.iss @@ -631,7 +631,7 @@ begin repeat if (FindRec.Attributes and FILE_ATTRIBUTE_DIRECTORY)=0 then begin FileName:=AppDir+'\bin\'+FindRec.name; - if (FileExists(FileName) and (not DeleteFile(FileName))) then begin + if ((not Pos(FindRec.name,'git.exe')=1) and FileExists(FileName) and (not DeleteFile(FileName))) then begin Log('Line {#emit __LINE__}: Unable to delete dupe "'+FileName+'", ignoring.'); end; end; -- 2.11.4.GIT