diff --git a/Build/NullSoftInstaller.hs b/Build/NullSoftInstaller.hs index 2dcaf6ac7b..6d8ca3a29b 100644 --- a/Build/NullSoftInstaller.hs +++ b/Build/NullSoftInstaller.hs @@ -94,10 +94,7 @@ gitInstallDir64 :: Exp FilePath gitInstallDir64 = fromString "$PROGRAMFILES64\\Git" gitInstallDir :: Exp FilePath -gitInstallDir = fileExists gitInstallDir32 ? - ( gitInstallDir32 - , fileExists gitInstallDir64 ? (gitInstallDir64, gitInstallDir32) - ) +gitInstallDir = gitInstallDir64 -- This intentionally has a different name than git-annex or -- git-annex-webapp, since it is itself treated as an executable file. diff --git a/CHANGELOG b/CHANGELOG index 873582718a..756459998d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,8 @@ git-annex (7.20190731) UNRELEASED; urgency=medium * Allow setting up a gcrypt special remote with encryption=shared. * Fix querying git for object type when operating on a file containing newlines. + * Windows installer: Always install to 64 bit program files directory, + since it needs 64 bit git now. -- Joey Hess Thu, 01 Aug 2019 00:11:56 -0400