Merge pull request #2681 from Varying-Vagrant-Vagrants/fix/git-safe-dir

Set up git safe.directory
Varying-Vagrant-Vagrants · Jul 24, 2023 · 4396722 · 4396722
2 parents 111911a + d221079
commit 4396722
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,7 @@ permalink: /docs/en-US/changelog/
 * Fixed a vagrantfile error on Arm when the vagrant-parallels plugin is missing ( #2670 )
 * Miscellanous Shellcheck linter fixes and improvements ( #2675 )
 * Github action fixes for composer and an upgrade to Ubuntu 20 ( #2677 )
+* Fixed an issue with git safe directories ( #2681 )
 
 ## 3.11.2 ( 2023 May 8th )
 

diff --git a/provision/core/git/provision.sh b/provision/core/git/provision.sh
@@ -58,5 +58,7 @@ function git_after_packages() {
     vvv_info " * Git hasn't been told how to merge branches, setting pull.rebase false for the merge strategy"
     noroot git config --global pull.rebase false
   fi
+  git config --global --add safe.directory '*' # Allow git to work well under docker provider
+  noroot git config --global --add safe.directory '*' # Allow git to work well under docker provider
 }
 vvv_add_hook after_packages git_after_packages