From 911bb6da218ddfca4738f05b95aa9c9b91f8922c Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 19 Aug 2015 19:41:41 +0200 Subject: [PATCH 1/3] installer (64-bit): remove 2GB pack size limit TODO: fix redirection and test!!! In 64-bit setups it does not make sense to limit the pack size to 2GB. This fixes https://github.com/git-for-windows/git/issues/288. Signed-off-by: Johannes Schindelin --- installer/install.iss.in | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/installer/install.iss.in b/installer/install.iss.in index f573a26640..13315bc628 100644 --- a/installer/install.iss.in +++ b/installer/install.iss.in @@ -1224,6 +1224,7 @@ end; procedure CurStepChanged(CurStep:TSetupStep); var AppDir,ProgramData,DllPath,FileName,Cmd,Msg:String; + PackSizeLimit:AnsiString; BuiltIns,ImageNames,EnvPath,EnvHome:TArrayOfString; Count,i:Longint; LinkCreated:Boolean; @@ -1342,6 +1343,17 @@ begin end; end; if FileExists(ProgramData + '\Git\config') then begin +#ifdef IS64 + FileName:=AppDir+'tmp\packsize.txt'; + if not Exec(AppDir+'\{#MINGW_BITNESS}\bin\git.exe','config -f config pack.packsizelimit >"'+FileName+'"',AppDir,SW_HIDE,ewWaitUntilTerminated,i) then + LogError('Unable to read packsize limit') + else if not LoadStringFromFile(FileName,PackSizeLimit) then + LogError('Unable to read redirected packsize limit') + else if (PackSizeLimit='2g'#10) and not Exec(AppDir+'\{#MINGW_BITNESS}\bin\git.exe','config -f config --unset pack.packsizelimit',AppDir,SW_HIDE,ewWaitUntilTerminated,i) then + LogError('Unable to unset packsize limit'); +SuppressibleMsgBox('PackSizeLimit: "'+PackSizeLimit+'"',mbError,MB_OK,IDOK); + DeleteFile(FileName); +#endif Cmd:='http.sslCAInfo "' + AppDir + '/{#MINGW_BITNESS}/ssl/certs/ca-bundle.crt"'; StringChangeEx(Cmd,'\','/',True); if not Exec(AppDir+'\{#MINGW_BITNESS}\bin\git.exe','config -f config '+Cmd, From 6a5f57d98a2c00fe95b26e42ca759a5c52f62048 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 16 Feb 2023 10:54:58 +0100 Subject: [PATCH 2/3] ReleaseNotes: allow building Git for Windows/ARM64 v2.39.2 This temporarily reverts the Release Notes to what they were in 6fea8ff7b (Prepare release notes for v2.39.2, 2023-02-07). Signed-off-by: Johannes Schindelin --- ReleaseNotes.md | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 59d74de105..5250948732 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -40,23 +40,6 @@ Git for Windows also contains Embedded CAcert Root Certificates. For more inform This package contains software from a number of other projects including Bash, zlib, curl, tcl/tk, perl, MSYS2 and a number of libraries and utilities from the GNU project, licensed under the GNU General Public License. Likewise, it contains Perl which is dual licensed under the GNU General Public License and the Artistic License. -## Changes since Git for Windows v2.39.2 (February 14th 2023) - -As announced previously, Git for Windows will drop support for Windows 7 and for Windows 8 in one of the next versions, following [Cygwin's and MSYS2's lead](https://www.msys2.org/docs/windows_support/) (Git for Windows relies on MSYS2 for components such as Bash and Perl). - -### New Features - -* In the olden Git days, there were "dashed" Git commands (e.g. `git-commit` instead of `git commit`). These haven't been supported for interactive use in a really, really long time. But they still worked in Git aliases and hooks ("scripts"). Since Git v1.5.4 (released on February 2nd, 2008), it was discouraged/deprecated to use dashed Git commands even in scripts. As of this version, Git for Windows [no longer supports these dashed commands](https://github.com/git-for-windows/git/pull/4252). -* Comes with [tig v2.5.8](https://github.com/jonas/tig/releases/tag/tig-2.5.8). -* Comes with [Bash v5.2 patchlevel 15](https://tiswww.case.edu/php/chet/bash/NEWS). -* Comes with [OpenSSL v1.1.1t](https://github.com/openssl/openssl/releases/tag/OpenSSL_1_1_1t). -* Comes with [GNU TLS v3.8.0](https://lists.gnupg.org/pipermail/gnutls-help/2023-February/004816.html). -* Comes with [cURL v7.88.0](https://github.com/curl/curl/releases/tag/curl-7_88_0). - -### Bug Fixes - -* Some commands mishandled absolute paths near the drive root (e.g. [`scalar unregister C:/foo`](https://github.com/git-for-windows/git/issues/4200)), which has been [fixed](https://github.com/git-for-windows/git/pull/4253). - ## Changes since Git for Windows v2.39.1 (January 17th 2023) This is a security release, addressing [CVE-2023-22490](https://github.com/git/git/security/advisories/GHSA-gw92-x3fm-3g3q), [CVE-2023-22743](https://github.com/git-for-windows/git/security/advisories/GHSA-p2x9-prp4-8gvq), [CVE-2023-23618](https://github.com/git-for-windows/git/security/advisories/GHSA-wxwv-49qw-35pm) and [CVE-2023-23946](https://github.com/git/git/security/advisories/GHSA-r87m-v37r-cwfh). From a4ffce4599b574ba74aa8a1ed5791a207b164cb1 Mon Sep 17 00:00:00 2001 From: MPGaby23 <151735160+MPGaby23@users.noreply.github.com> Date: Wed, 22 Nov 2023 14:00:39 +0200 Subject: [PATCH 3/3] Update git-update-git-for-windows Need to replace //SILENT command with //VERYSILENT in order to make the update silent. --- git-extra/git-update-git-for-windows | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-extra/git-update-git-for-windows b/git-extra/git-update-git-for-windows index 462bd57158..eae1964b7d 100755 --- a/git-extra/git-update-git-for-windows +++ b/git-extra/git-update-git-for-windows @@ -346,7 +346,7 @@ update_git_for_windows () { echo "Downloading $filename" >&2 fi curl -# -L -o $installer $download || return - start "" "$installer" //SILENT //NORESTART + start "" "$installer" //VERYSILENT //NORESTART # Kill all Bash processes (which will let MinTTY quit, too)" #