Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set up git safe.directory #2681

Merged
merged 2 commits into from
Jul 24, 2023
Merged

Set up git safe.directory #2681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80a61f4
Set up safe.directory for issues with docker WIP
msaggiorato May 9, 2023
d221079
update changelog
tomjn Jul 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )

Expand Down
2 changes: 2 additions & 0 deletions provision/core/git/provision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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