From fa1e5dc95a8b72fd254954993558bbd2c972ccd2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 1 Dec 2024 21:53:11 -0700
Subject: [PATCH] Bump Git version on Windows to 2.47.1.windows.1 (#470)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: Update the Git Package Windows patch for Windows Nanoserver

Made with ❤️️ by updatecli

* chore: Update the Git Package Windows patch for Windows Server Core

Made with ❤️️ by updatecli

* chore: Update the Git Windows version for Windows Server Core

Made with ❤️️ by updatecli

* chore: Update the Git Windows version for Windows Nanoserver

Made with ❤️️ by updatecli

---------

Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com>
---
 windows/nanoserver/Dockerfile        | 4 ++--
 windows/windowsservercore/Dockerfile | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/windows/nanoserver/Dockerfile b/windows/nanoserver/Dockerfile
index 4999166c..0b02c12e 100644
--- a/windows/nanoserver/Dockerfile
+++ b/windows/nanoserver/Dockerfile
@@ -60,8 +60,8 @@ RUN $javaMajorVersion = $env:JAVA_HOME.Substring($env:JAVA_HOME.Length - 2); `
     New-Item -Path "C:\jdk-${javaMajorVersion}" -ItemType SymbolicLink -Value "${env:JAVA_HOME}"
 
 # Install git
-ARG GIT_VERSION=2.47.0
-ARG GIT_PATCH_VERSION=2
+ARG GIT_VERSION=2.47.1
+ARG GIT_PATCH_VERSION=1
 RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
     # The patch "windows.1" always have a different URL than the subsequent patch (ZIP filename is different)
     if($env:GIT_PATCH_VERSION -eq 1) { $url = $('https://github.com/git-for-windows/git/releases/download/v{0}.windows.{1}/MinGit-{0}-64-bit.zip' -f $env:GIT_VERSION, $env:GIT_PATCH_VERSION); } `
diff --git a/windows/windowsservercore/Dockerfile b/windows/windowsservercore/Dockerfile
index 7fa33205..6a8801a8 100644
--- a/windows/windowsservercore/Dockerfile
+++ b/windows/windowsservercore/Dockerfile
@@ -55,8 +55,8 @@ ENV JENKINS_AGENT_WORK ${JENKINS_AGENT_WORK}
 USER ContainerAdministrator
 
 # Install git
-ARG GIT_VERSION=2.47.0
-ARG GIT_PATCH_VERSION=2
+ARG GIT_VERSION=2.47.1
+ARG GIT_PATCH_VERSION=1
 RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
     # The patch "windows.1" always have a different URL than the subsequent patch (ZIP filename is different)
     if($env:GIT_PATCH_VERSION -eq 1) { $url = $('https://github.com/git-for-windows/git/releases/download/v{0}.windows.{1}/MinGit-{0}-64-bit.zip' -f $env:GIT_VERSION, $env:GIT_PATCH_VERSION); } `