[All OSes] Revert gitlfs changes (#9984)

* Revert "[Ubuntu] Add new git environment variable (#9899)" This reverts commit ee7edb4. * Revert "[Windows] Add new git environment variable (#9898)" This reverts commit 5113d25. * Revert "[macOS] Add new git environment variable (#9900)" This reverts commit 5c60b0c.
actions · Jun 4, 2024 · 52bcf84 · 52bcf84
1 parent 5a99573
commit 52bcf84
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 21 deletions.
diff --git a/images/macos/scripts/build/configure-machine.sh b/images/macos/scripts/build/configure-machine.sh
@@ -103,6 +103,3 @@ if [[ ! -d "/usr/local/bin" ]];then
 fi
 chmod +x $HOME/utils/invoke-tests.sh
 sudo ln -s $HOME/utils/invoke-tests.sh /usr/local/bin/invoke_tests
-
-# Revert to the old behaviour and avoid the Git LFS problems (https://github.blog/2024-05-14-securing-git-addressing-5-new-vulnerabilities/)
-echo "export GIT_CLONE_PROTECTION_ACTIVE=false" >> $HOME/.bashrc
diff --git a/images/macos/scripts/tests/Git.Tests.ps1 b/images/macos/scripts/tests/Git.Tests.ps1
@@ -9,7 +9,4 @@ Describe "Git" {
     It "git lfs is installed" -Skip:($os.IsBigSur) {
         "git lfs version" | Should -ReturnZeroExitCode
     }
-    It "GIT_CLONE_PROTECTION_ACTIVE environment variable should be equal false" {
-        $env:GIT_CLONE_PROTECTION_ACTIVE | Should -BeExactly false
-    }
 }
diff --git a/images/ubuntu/scripts/build/install-git.sh b/images/ubuntu/scripts/build/install-git.sh
@@ -6,7 +6,6 @@
 
 # Source the helpers for use with the script
 source $HELPER_SCRIPTS/install.sh
-source $HELPER_SCRIPTS/etc-environment.sh
 
 GIT_REPO="ppa:git-core/ppa"
 
@@ -21,10 +20,6 @@ cat <<EOF >> /etc/gitconfig
         directory = *
 EOF
 
-# Revert to the old behaviour and avoid the Git LFS problems (https://github.blog/2024-05-14-securing-git-addressing-5-new-vulnerabilities/)
-set_etc_environment_variable "GIT_CLONE_PROTECTION_ACTIVE" 'false'
-reload_etc_environment
-
 # Install git-ftp
 apt-get install git-ftp
 

diff --git a/images/ubuntu/scripts/tests/Tools.Tests.ps1 b/images/ubuntu/scripts/tests/Tools.Tests.ps1
@@ -259,10 +259,6 @@ Describe "Git" {
     It "git-ftp" {
         "git-ftp --version" | Should -ReturnZeroExitCode
     }
-
-    It "GIT_CLONE_PROTECTION_ACTIVE environment variable should be equal false" {
-        $env:GIT_CLONE_PROTECTION_ACTIVE | Should -BeExactly false
-    }
 }
 
 Describe "Git-lfs" {

diff --git a/images/windows/scripts/build/Install-Git.ps1 b/images/windows/scripts/build/Install-Git.ps1
@@ -41,8 +41,6 @@ if ($LASTEXITCODE -ne 0) {
 
 # Disable GCM machine-wide
 [Environment]::SetEnvironmentVariable("GCM_INTERACTIVE", "Never", "Machine")
-# Revert to the old behaviour and avoid the Git LFS problems (https://github.blog/2024-05-14-securing-git-addressing-5-new-vulnerabilities/)
-[Environment]::SetEnvironmentVariable("GIT_CLONE_PROTECTION_ACTIVE", "false", "Machine")
 
 # Add to PATH
 Add-MachinePathItem "C:\Program Files\Git\bin"

diff --git a/images/windows/scripts/tests/Git.Tests.ps1 b/images/windows/scripts/tests/Git.Tests.ps1
@@ -22,8 +22,4 @@ Describe "Git" {
     It "GCM_INTERACTIVE environment variable should be equal Never" {
         $env:GCM_INTERACTIVE | Should -BeExactly Never
     }
-
-    It "GIT_CLONE_PROTECTION_ACTIVE environment variable should be equal false" {
-        $env:GIT_CLONE_PROTECTION_ACTIVE | Should -BeExactly false
-    }
 }