Skip to content

Commit 05f7dd7

Browse files
committed
Update git to 2.13.2. Closes gitextensions#3804.
1 parent 7e6fbb4 commit 05f7dd7

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Setup/DownloadExternals.cmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ REM Also update in Product.wxs and UI\RequiredSoftwareDlg.wxs
44

55
md %~p0\cache\ 2> NUL
66

7-
IF NOT EXIST "%~p0\cache\Git-2.12.2-32-bit.exe" (
8-
"%~p0\tools\curl.exe" -L -k -o %~p0\cache\Git-2.12.2-32-bit.exe https://github.com/git-for-windows/git/releases/download/v2.12.2.windows.1/Git-2.12.2-32-bit.exe
7+
IF NOT EXIST "%~p0\cache\Git-2.13.2-32-bit.exe" (
8+
"%~p0\tools\curl.exe" -L -k -o %~p0\cache\Git-2.13.2-32-bit.exe https://github.com/git-for-windows/git/releases/download/v2.13.2.windows.1/Git-2.13.2-32-bit.exe
99
IF ERRORLEVEL 1 EXIT /B 1
1010
)
1111

Setup/Product.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@
900900
<?if $(var.IncludeRequiredSoftware) = 1 ?>
901901
<Binary Id="KDiff" SourceFile="cache\KDiff3-32bit-Setup_0.9.97.exe" />
902902
<CustomAction Id="InstallKDiff" Impersonate="no" BinaryKey="KDiff" Execute="deferred" ExeCommand="" Return="ignore" />
903-
<Binary Id="Git" SourceFile="cache\Git-2.12.2-32-bit.exe" />
903+
<Binary Id="Git" SourceFile="cache\Git-2.13.2-32-bit.exe" />
904904
<CustomAction Id="InstallGit" Impersonate="no" BinaryKey="Git" Execute="deferred" ExeCommand="/COMPONENTS=&quot;assoc,assoc_sh&quot;" Return="ignore" />
905905
<InstallExecuteSequence>
906906
<Custom Action="InstallKDiff" After="InstallFiles"><![CDATA[INSTALLKDIFF3=1]]></Custom>

Setup/UI/RequiredSoftwareDlg.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Title}Required Software" />
1515
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="Install the additional software required to run Git Extensions" />
1616

17-
<Control Id="GitTitle" Type="Text" Height="15" Width="200" X="15" Y="70" Text="{\WixUI_Font_Title}Git for Windows 32bit 2.12.2" />
17+
<Control Id="GitTitle" Type="Text" Height="15" Width="200" X="15" Y="70" Text="{\WixUI_Font_Title}Git for Windows 32bit 2.13.2" />
1818
<Control Id="GitDescription" Type="Text" Height="46" Width="238" X="25" Y="86" Text="Git for Windows is the native version of Git that powers Git Extensions. You must have a version of Git installed for Git Extensions to function properly." />
1919
<Control Id="GitCheckBox" Type="CheckBox" Height="20" Width="78" X="274" Y="87" Text="Install Git" Property="INSTALLGIT" CheckBoxValue="1" />
2020

0 commit comments

Comments
 (0)