From 64a1c91b763515cbebaa1ae9b92903ed151eb868 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 5 Nov 2017 12:34:47 -0500
Subject: [PATCH 1/2] 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

From 4a3047b17019b757f4b1477bfad895cc8c272ee7 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 5 Nov 2017 12:37:42 -0500
Subject: [PATCH 2/2] feat: drop pinning of git version

---
 .circleci/config.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b163dc218..aa3d1c825 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -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: |