Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2025-12-29 00:25:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2973 from dokku/2796-git-quarantine

Browse Source 
feat: allow usage of git 2.13.0+ by unsetting GIT_QUARANTINE_PATH during git worktree usage
This commit is contained in:
Jose Diaz-Gonzalez
2017-11-05 16:07:59 -05:00
committed by GitHub
parent 39b879058d 4a3047b170
commit 158f10d321
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.circleci/config.yml
View File

@@ -9,9 +9,6 @@ jobs:
make ci-dependencies
- run: |
./tests/ci/setup.sh
- run: |
sudo apt-get remove -qq -y git
sudo apt-get install -qq -y git=1:1.9.1-1ubuntu0.7 git-man=1:1.9.1-1ubuntu0.7
- run: |
echo 'export DOKKU_SKIP_CLEANUP=true' | sudo tee /home/dokku/.dokkurc/dokku_skip_cleanup
- run: |

4
plugins/git/functions
View File

@@ -38,7 +38,9 @@ git_build_app_repo() {
if use_git_worktree; then
# git worktree - this method uses git worktree which was introduced in git 2.5
pushd "$DOKKU_ROOT/$APP" > /dev/null
git worktree add "$GIT_BUILD_APP_REPO_TMP_WORK_DIR" "$REV" > /dev/null
# unset the git quarantine path to allow us to use 2.13.0+
# See this issue for more information: https://github.com/dokku/dokku/issues/2796
env -u GIT_QUARANTINE_PATH git worktree add "$GIT_BUILD_APP_REPO_TMP_WORK_DIR" "$REV" > /dev/null
popd > /dev/null
pushd "$GIT_BUILD_APP_REPO_TMP_WORK_DIR" > /dev/null
else