From 80a61f461c09855875e20c82a0ce5d2e76b14b91 Mon Sep 17 00:00:00 2001 From: Matias Saggiorato Date: Tue, 9 May 2023 14:20:01 -0300 Subject: [PATCH 1/2] Set up safe.directory for issues with docker WIP --- provision/core/git/provision.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/provision/core/git/provision.sh b/provision/core/git/provision.sh index fcc99e37d..6fef4bc30 100644 --- 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 From d221079c843034b2c7ff6aa0c416203751c24f89 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Sun, 23 Jul 2023 12:17:08 +0100 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index db60a547e..d3a294fa1 100644 --- 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 )