From ebd28694c2f740210efcb5320b706c943a6f2fe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?=
 <91831478+lemeurherve@users.noreply.github.com>
Date: Wed, 13 Sep 2023 15:40:33 +0200
Subject: [PATCH 01/15] wip: set `PATH` before installing `git-lfs` version
 3.4.0

---
 windows/nanoserver/Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/windows/nanoserver/Dockerfile b/windows/nanoserver/Dockerfile
index 59a78c852..631b98c98 100644
--- a/windows/nanoserver/Dockerfile
+++ b/windows/nanoserver/Dockerfile
@@ -55,7 +55,9 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
     Expand-Archive mingit.zip -DestinationPath c:\mingit ; `
     Remove-Item mingit.zip -Force
 
-ARG GIT_LFS_VERSION=3.1.4
+ENV PATH="${WindowsPATH};${ProgramFiles}\PowerShell;${JAVA_HOME}\bin;C:\mingit\cmd"
+
+ARG GIT_LFS_VERSION=3.4.0
 RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
     $url = $('https://github.com/git-lfs/git-lfs/releases/download/v{0}/git-lfs-windows-amd64-v{0}.zip' -f $env:GIT_LFS_VERSION) ; `
     Write-Host "Retrieving $url..." ; `
@@ -67,7 +69,6 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
 ENV ProgramFiles="C:\Program Files" `
     WindowsPATH="C:\Windows\system32;C:\Windows" `
     JAVA_HOME="${JAVA_HOME}"
-ENV PATH="${WindowsPATH};${ProgramFiles}\PowerShell;${JAVA_HOME}\bin;C:\mingit\cmd"
 
 ARG user=jenkins
 

From 5c7c03d4d677857e016594b309905a7434d76a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?=
 <91831478+lemeurherve@users.noreply.github.com>
Date: Wed, 13 Sep 2023 16:14:36 +0200
Subject: [PATCH 02/15] run git-lfs.exe install instead of git.exe lfs install

---
 windows/nanoserver/Dockerfile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/windows/nanoserver/Dockerfile b/windows/nanoserver/Dockerfile
index 631b98c98..d7f351d90 100644
--- a/windows/nanoserver/Dockerfile
+++ b/windows/nanoserver/Dockerfile
@@ -55,6 +55,9 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
     Expand-Archive mingit.zip -DestinationPath c:\mingit ; `
     Remove-Item mingit.zip -Force
 
+ENV ProgramFiles="C:\Program Files" `
+    WindowsPATH="C:\Windows\system32;C:\Windows" `
+    JAVA_HOME="${JAVA_HOME}"
 ENV PATH="${WindowsPATH};${ProgramFiles}\PowerShell;${JAVA_HOME}\bin;C:\mingit\cmd"
 
 ARG GIT_LFS_VERSION=3.4.0
@@ -64,11 +67,7 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
     Invoke-WebRequest $url -OutFile 'GitLfs.zip' -UseBasicParsing ; `
     Expand-Archive GitLfs.zip -DestinationPath c:\mingit\mingw64\bin ; `
     Remove-Item GitLfs.zip -Force ; `
-    & C:\mingit\cmd\git.exe lfs install
-
-ENV ProgramFiles="C:\Program Files" `
-    WindowsPATH="C:\Windows\system32;C:\Windows" `
-    JAVA_HOME="${JAVA_HOME}"
+    & c:\mingit\mingw64\bin\git-lfs.exe install
 
 ARG user=jenkins
 

From ab93b371e7ef3ffd2ced42ea9ba1a76954a00a66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?=
 <91831478+lemeurherve@users.noreply.github.com>
Date: Wed, 13 Sep 2023 16:24:33 +0200
Subject: [PATCH 03/15] Update Dockerfile

---
 windows/nanoserver/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/windows/nanoserver/Dockerfile b/windows/nanoserver/Dockerfile
index d7f351d90..d7c3e210d 100644
--- a/windows/nanoserver/Dockerfile
+++ b/windows/nanoserver/Dockerfile
@@ -67,7 +67,7 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
     Invoke-WebRequest $url -OutFile 'GitLfs.zip' -UseBasicParsing ; `
     Expand-Archive GitLfs.zip -DestinationPath c:\mingit\mingw64\bin ; `
     Remove-Item GitLfs.zip -Force ; `
-    & c:\mingit\mingw64\bin\git-lfs.exe install
+    & c:\mingit\mingw64\bin\git-lfs-3.4.0\git-lfs.exe install
 
 ARG user=jenkins
 

From de2a24b08af3bca70eb1cd57b331ae52139acef3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?=
 <91831478+lemeurherve@users.noreply.github.com>
Date: Wed, 13 Sep 2023 16:37:50 +0200
Subject: [PATCH 04/15] use variable for git-lfs.exe path

---
 windows/nanoserver/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/windows/nanoserver/Dockerfile b/windows/nanoserver/Dockerfile
index d7c3e210d..8c359c0c4 100644
--- a/windows/nanoserver/Dockerfile
+++ b/windows/nanoserver/Dockerfile
@@ -67,7 +67,8 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
     Invoke-WebRequest $url -OutFile 'GitLfs.zip' -UseBasicParsing ; `
     Expand-Archive GitLfs.zip -DestinationPath c:\mingit\mingw64\bin ; `
     Remove-Item GitLfs.zip -Force ; `
-    & c:\mingit\mingw64\bin\git-lfs-3.4.0\git-lfs.exe install
+    $gitLfsPath = 'c:\mingit\mingw64\bin\git-lfs-{0}' -f $env:GIT_LFS_VERSION) ; `
+    & ${gitLfsPath}\git-lfs.exe install
 
 ARG user=jenkins
 

From 8b050d47d5d5901f2b479f19fe7c063b36702782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?=
 <91831478+lemeurherve@users.noreply.github.com>
Date: Wed, 13 Sep 2023 16:56:58 +0200
Subject: [PATCH 05/15] Move git-lfs to c:\mingit\mingw64\bin\

---
 windows/nanoserver/Dockerfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/windows/nanoserver/Dockerfile b/windows/nanoserver/Dockerfile
index 8c359c0c4..caaf7a592 100644
--- a/windows/nanoserver/Dockerfile
+++ b/windows/nanoserver/Dockerfile
@@ -66,9 +66,11 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
     Write-Host "Retrieving $url..." ; `
     Invoke-WebRequest $url -OutFile 'GitLfs.zip' -UseBasicParsing ; `
     Expand-Archive GitLfs.zip -DestinationPath c:\mingit\mingw64\bin ; `
-    Remove-Item GitLfs.zip -Force ; `
     $gitLfsPath = 'c:\mingit\mingw64\bin\git-lfs-{0}' -f $env:GIT_LFS_VERSION) ; `
-    & ${gitLfsPath}\git-lfs.exe install
+    Move-Item -Path "${gitLfsPath}\git-lfs.exe" -Destination 'c:\mingit\mingw64\bin\' ; `
+    Remove-Item -Path $gitLfsPath -Recurse -Force
+    Remove-Item GitLfs.zip -Force ; `
+    & c:\mingit\mingw64\bin\git-lfs.exe install
 
 ARG user=jenkins
 

From 9fc480c85c3f6ec1bedcb8d62221f4598f3575b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?=
 <91831478+lemeurherve@users.noreply.github.com>
Date: Wed, 13 Sep 2023 16:58:04 +0200
Subject: [PATCH 06/15] replace `gitLfsPath` by `gitLfsFolder`

---
 windows/nanoserver/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/windows/nanoserver/Dockerfile b/windows/nanoserver/Dockerfile
index caaf7a592..3cd9bd7a8 100644
--- a/windows/nanoserver/Dockerfile
+++ b/windows/nanoserver/Dockerfile
@@ -66,9 +66,9 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
     Write-Host "Retrieving $url..." ; `
     Invoke-WebRequest $url -OutFile 'GitLfs.zip' -UseBasicParsing ; `
     Expand-Archive GitLfs.zip -DestinationPath c:\mingit\mingw64\bin ; `
-    $gitLfsPath = 'c:\mingit\mingw64\bin\git-lfs-{0}' -f $env:GIT_LFS_VERSION) ; `
-    Move-Item -Path "${gitLfsPath}\git-lfs.exe" -Destination 'c:\mingit\mingw64\bin\' ; `
-    Remove-Item -Path $gitLfsPath -Recurse -Force
+    $gitLfsFolder = 'c:\mingit\mingw64\bin\git-lfs-{0}' -f $env:GIT_LFS_VERSION) ; `
+    Move-Item -Path "${gitLfsFolder}\git-lfs.exe" -Destination 'c:\mingit\mingw64\bin\' ; `
+    Remove-Item -Path $gitLfsFolder -Recurse -Force
     Remove-Item GitLfs.zip -Force ; `
     & c:\mingit\mingw64\bin\git-lfs.exe install
 

From 8d32d99b01359cd095b027f30e4511738e3c64c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?=
 <91831478+lemeurherve@users.noreply.github.com>
Date: Wed, 13 Sep 2023 17:07:27 +0200
Subject: [PATCH 07/15] Update Dockerfile

---
 windows/nanoserver/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/windows/nanoserver/Dockerfile b/windows/nanoserver/Dockerfile
index 3cd9bd7a8..4d9845a7b 100644
--- a/windows/nanoserver/Dockerfile
+++ b/windows/nanoserver/Dockerfile
@@ -68,7 +68,7 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
     Expand-Archive GitLfs.zip -DestinationPath c:\mingit\mingw64\bin ; `
     $gitLfsFolder = 'c:\mingit\mingw64\bin\git-lfs-{0}' -f $env:GIT_LFS_VERSION) ; `
     Move-Item -Path "${gitLfsFolder}\git-lfs.exe" -Destination 'c:\mingit\mingw64\bin\' ; `
-    Remove-Item -Path $gitLfsFolder -Recurse -Force
+    Remove-Item -Path $gitLfsFolder -Recurse -Force ; `
     Remove-Item GitLfs.zip -Force ; `
     & c:\mingit\mingw64\bin\git-lfs.exe install
 

From 5d463e81311fbc052d2897bbf25ab04089bb92a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= <lemeurherve.jenkins@gmail.com>
Date: Wed, 13 Sep 2023 17:33:24 +0200
Subject: [PATCH 08/15] fix

---
 windows/nanoserver/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/windows/nanoserver/Dockerfile b/windows/nanoserver/Dockerfile
index 4d9845a7b..e7e610ac8 100644
--- a/windows/nanoserver/Dockerfile
+++ b/windows/nanoserver/Dockerfile
@@ -66,8 +66,8 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
     Write-Host "Retrieving $url..." ; `
     Invoke-WebRequest $url -OutFile 'GitLfs.zip' -UseBasicParsing ; `
     Expand-Archive GitLfs.zip -DestinationPath c:\mingit\mingw64\bin ; `
-    $gitLfsFolder = 'c:\mingit\mingw64\bin\git-lfs-{0}' -f $env:GIT_LFS_VERSION) ; `
-    Move-Item -Path "${gitLfsFolder}\git-lfs.exe" -Destination 'c:\mingit\mingw64\bin\' ; `
+    $gitLfsFolder = 'c:\mingit\mingw64\bin\git-lfs-{0}' -f $env:GIT_LFS_VERSION ; `
+    Move-Item -Path "${gitLfsFolder}\git-lfs.exe" -Destination c:\mingit\mingw64\bin\ ; `
     Remove-Item -Path $gitLfsFolder -Recurse -Force ; `
     Remove-Item GitLfs.zip -Force ; `
     & c:\mingit\mingw64\bin\git-lfs.exe install

From fb239a74b8d23ab3f8c9027c1da5be35d26facb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= <lemeurherve.jenkins@gmail.com>
Date: Wed, 13 Sep 2023 17:49:49 +0200
Subject: [PATCH 09/15] add git-lfs test

---
 tests/agent.Tests.ps1                      | 12 ++++++++++++
 updatecli/updatecli.d/git-lfs-windows.yaml | 11 +++++++++++
 2 files changed, 23 insertions(+)

diff --git a/tests/agent.Tests.ps1 b/tests/agent.Tests.ps1
index 876d27780..eacbe869e 100644
--- a/tests/agent.Tests.ps1
+++ b/tests/agent.Tests.ps1
@@ -23,6 +23,8 @@ if($global:WINDOWSFLAVOR -eq 'nanoserver') {
     $global:CONTAINERSHELL = "pwsh.exe"
 }
 
+$global:GITLFSVERSION = '3.4.0'
+
 Cleanup($global:CONTAINERNAME)
 
 Describe "[$global:AGENT_IMAGE] image is present" {
@@ -70,6 +72,16 @@ Describe "[$global:AGENT_IMAGE] image has correct applications in the PATH" {
         $stdout.Trim() | Should -Match "user.*jenkins"
     }
 
+    It 'has git-lfs (and thus git) installed' {
+        $exitCode, $stdout, $stderr = Run-Program 'docker' "exec $global:CONTAINERNAME $global:CONTAINERSHELL -C `"`$global:GITLFSVERSION = git lfs version 2>&1 ; Write-Host `$global:GITLFSVERSION`""
+        $exitCode | Should -Be 0
+        # $stdout.Trim() | Should -Match "git-lfs/${global:GITLFSVERSION}"
+        $r = [regex] "^git-lfs/`"(?<gitlfsversion>\d+)"
+        $m = $r.Match($stdout)
+        $m | Should -Not -Be $null
+        $m.Groups['gitlfsversion'].ToString() | Should -Be $global:GITLFSVERSION
+    }
+
     AfterAll {
         Cleanup($global:CONTAINERNAME)
     }
diff --git a/updatecli/updatecli.d/git-lfs-windows.yaml b/updatecli/updatecli.d/git-lfs-windows.yaml
index 65cae25d7..eb4f8d124 100644
--- a/updatecli/updatecli.d/git-lfs-windows.yaml
+++ b/updatecli/updatecli.d/git-lfs-windows.yaml
@@ -45,6 +45,17 @@ targets:
         keyword: ARG
         matcher: GIT_LFS_VERSION
     scmid: default
+  setGitLfsVersionTests:
+    name: Update the `git-lfs` Windows version for Windows Core Server
+    kind: file
+    spec:
+      file: tests/agent.Tests.ps1
+      matchpattern: >
+        global:GIT_LFS_VERSION = '(.*)'$
+      replacepattern: >
+        global:GIT_LFS_VERSION = '{{ source "lastVersion" }}'
+    scmid: default
+    
 
 actions:
   default:

From f031eda81290c3612172112b6eea63042e48ef12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= <lemeurherve.jenkins@gmail.com>
Date: Wed, 13 Sep 2023 18:00:05 +0200
Subject: [PATCH 10/15] wip test

---
 tests/agent.Tests.ps1 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/agent.Tests.ps1 b/tests/agent.Tests.ps1
index eacbe869e..771583693 100644
--- a/tests/agent.Tests.ps1
+++ b/tests/agent.Tests.ps1
@@ -73,13 +73,13 @@ Describe "[$global:AGENT_IMAGE] image has correct applications in the PATH" {
     }
 
     It 'has git-lfs (and thus git) installed' {
-        $exitCode, $stdout, $stderr = Run-Program 'docker' "exec $global:CONTAINERNAME $global:CONTAINERSHELL -C `"`$global:GITLFSVERSION = git lfs version 2>&1 ; Write-Host `$global:GITLFSVERSION`""
+        $exitCode, $stdout, $stderr = Run-Program 'docker' "exec $global:CONTAINERNAME $global:CONTAINERSHELL -C `"`& git lfs version`""
         $exitCode | Should -Be 0
-        # $stdout.Trim() | Should -Match "git-lfs/${global:GITLFSVERSION}"
-        $r = [regex] "^git-lfs/`"(?<gitlfsversion>\d+)"
-        $m = $r.Match($stdout)
-        $m | Should -Not -Be $null
-        $m.Groups['gitlfsversion'].ToString() | Should -Be $global:GITLFSVERSION
+        $stdout.Trim() | Should -Match "git-lfs/${global:GITLFSVERSION}"
+        # $r = [regex] "^git-lfs/`"(?<gitlfsversion>\d+)"
+        # $m = $r.Match($stdout)
+        # $m | Should -Not -Be $null
+        # $m.Groups['gitlfsversion'].ToString() | Should -Be $global:GITLFSVERSION
     }
 
     AfterAll {

From 308b31be4b9cce8f011a66c3f243bd7fab2ce545 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= <lemeurherve.jenkins@gmail.com>
Date: Wed, 13 Sep 2023 18:00:37 +0200
Subject: [PATCH 11/15] correct target name

---
 updatecli/updatecli.d/git-lfs-windows.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/updatecli/updatecli.d/git-lfs-windows.yaml b/updatecli/updatecli.d/git-lfs-windows.yaml
index eb4f8d124..c372b3895 100644
--- a/updatecli/updatecli.d/git-lfs-windows.yaml
+++ b/updatecli/updatecli.d/git-lfs-windows.yaml
@@ -46,7 +46,7 @@ targets:
         matcher: GIT_LFS_VERSION
     scmid: default
   setGitLfsVersionTests:
-    name: Update the `git-lfs` Windows version for Windows Core Server
+    name: Update the `git-lfs` Windows version in tests
     kind: file
     spec:
       file: tests/agent.Tests.ps1

From 82628a21a200e880a32c217e166ca10a3e1c1004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= <lemeurherve.jenkins@gmail.com>
Date: Wed, 13 Sep 2023 18:15:12 +0200
Subject: [PATCH 12/15] bump git-lfs in Windows Server Core images too for
 passing the new test

---
 windows/windowsservercore/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/windows/windowsservercore/Dockerfile b/windows/windowsservercore/Dockerfile
index 29c16e408..ee98c8c22 100644
--- a/windows/windowsservercore/Dockerfile
+++ b/windows/windowsservercore/Dockerfile
@@ -47,7 +47,7 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
     Expand-Archive mingit.zip -DestinationPath c:\mingit ; `
     Remove-Item mingit.zip -Force
 
-ARG GIT_LFS_VERSION=3.1.4
+ARG GIT_LFS_VERSION=3.4.0
 RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
     $url = $('https://github.com/git-lfs/git-lfs/releases/download/v{0}/git-lfs-windows-amd64-v{0}.zip' -f $env:GIT_LFS_VERSION) ; `
     Write-Host "Retrieving $url..." ; `

From dff5b3a0caecfd601ca2b50b1c131eb3f5b60c32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= <lemeurherve.jenkins@gmail.com>
Date: Wed, 13 Sep 2023 18:15:35 +0200
Subject: [PATCH 13/15] cleanup

---
 tests/agent.Tests.ps1 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/agent.Tests.ps1 b/tests/agent.Tests.ps1
index 771583693..1ad799e1a 100644
--- a/tests/agent.Tests.ps1
+++ b/tests/agent.Tests.ps1
@@ -76,10 +76,6 @@ Describe "[$global:AGENT_IMAGE] image has correct applications in the PATH" {
         $exitCode, $stdout, $stderr = Run-Program 'docker' "exec $global:CONTAINERNAME $global:CONTAINERSHELL -C `"`& git lfs version`""
         $exitCode | Should -Be 0
         $stdout.Trim() | Should -Match "git-lfs/${global:GITLFSVERSION}"
-        # $r = [regex] "^git-lfs/`"(?<gitlfsversion>\d+)"
-        # $m = $r.Match($stdout)
-        # $m | Should -Not -Be $null
-        # $m.Groups['gitlfsversion'].ToString() | Should -Be $global:GITLFSVERSION
     }
 
     AfterAll {

From 3b138e7492ef2a4b1cad6cf2213e0fa23bedf477 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= <lemeurherve.jenkins@gmail.com>
Date: Wed, 13 Sep 2023 18:37:59 +0200
Subject: [PATCH 14/15] wip windowsservercore

---
 windows/windowsservercore/Dockerfile | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/windows/windowsservercore/Dockerfile b/windows/windowsservercore/Dockerfile
index ee98c8c22..9174920ac 100644
--- a/windows/windowsservercore/Dockerfile
+++ b/windows/windowsservercore/Dockerfile
@@ -47,18 +47,22 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
     Expand-Archive mingit.zip -DestinationPath c:\mingit ; `
     Remove-Item mingit.zip -Force
 
+# Add git and java in PATH
+RUN $CurrentPath = (Get-Itemproperty -path 'hklm:\system\currentcontrolset\control\session manager\environment' -Name Path).Path ; `
+    $NewPath = $CurrentPath + $(';{0}\bin;C:\mingit\cmd' -f $env:JAVA_HOME) ; `
+    Set-ItemProperty -path 'hklm:\system\currentcontrolset\control\session manager\environment' -Name Path -Value $NewPath
+
 ARG GIT_LFS_VERSION=3.4.0
 RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
     $url = $('https://github.com/git-lfs/git-lfs/releases/download/v{0}/git-lfs-windows-amd64-v{0}.zip' -f $env:GIT_LFS_VERSION) ; `
     Write-Host "Retrieving $url..." ; `
     Invoke-WebRequest $url -OutFile 'GitLfs.zip' -UseBasicParsing ; `
     Expand-Archive GitLfs.zip -DestinationPath c:\mingit\mingw64\bin ; `
+    $gitLfsFolder = 'c:\mingit\mingw64\bin\git-lfs-{0}' -f $env:GIT_LFS_VERSION ; `
+    Move-Item -Path "${gitLfsFolder}\git-lfs.exe" -Destination c:\mingit\mingw64\bin\ ; `
+    Remove-Item -Path $gitLfsFolder -Recurse -Force ; `
     Remove-Item GitLfs.zip -Force ; `
-    & C:\mingit\cmd\git.exe lfs install ; `
-    $CurrentPath = (Get-Itemproperty -path 'hklm:\system\currentcontrolset\control\session manager\environment' -Name Path).Path ; `
-    # Add git and java in PATH
-    $NewPath = $CurrentPath + $(';{0}\bin;C:\mingit\cmd' -f $env:JAVA_HOME) ; `
-    Set-ItemProperty -path 'hklm:\system\currentcontrolset\control\session manager\environment' -Name Path -Value $NewPath
+    & c:\mingit\mingw64\bin\git-lfs.exe install
 
 ARG user=jenkins
 

From 27f27b15756ecf0bbb7e5f8d90791bb6f14043a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?=
 <91831478+lemeurherve@users.noreply.github.com>
Date: Wed, 13 Sep 2023 21:00:37 +0200
Subject: [PATCH 15/15] remove duplicate empty line

---
 updatecli/updatecli.d/git-lfs-windows.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/updatecli/updatecli.d/git-lfs-windows.yaml b/updatecli/updatecli.d/git-lfs-windows.yaml
index c372b3895..ce1fc83b5 100644
--- a/updatecli/updatecli.d/git-lfs-windows.yaml
+++ b/updatecli/updatecli.d/git-lfs-windows.yaml
@@ -55,7 +55,6 @@ targets:
       replacepattern: >
         global:GIT_LFS_VERSION = '{{ source "lastVersion" }}'
     scmid: default
-    
 
 actions:
   default: