From 64a1c91b763515cbebaa1ae9b92903ed151eb868 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 5 Nov 2017 12:34:47 -0500 Subject: [PATCH] feat: allow usage of git 2.13.0+ by unsetting GIT_QUARANTINE_PATH during git worktree usage Closes #2796 --- plugins/git/functions | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/git/functions b/plugins/git/functions index 051ceb54d..e3ee2c5fa 100755 --- a/plugins/git/functions +++ b/plugins/git/functions @@ -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