From 22dfed320936883b7fefe97a7db150dfab843933 Mon Sep 17 00:00:00 2001
From: Tsukasa Kanzaki <tsukasa.kzk@gmail.com>
Date: Tue, 16 Jul 2019 02:05:13 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=BC=E5=AE=B9=20git=20version=202.1?=
 =?UTF-8?q?1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Envoy.blade.php | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/Envoy.blade.php b/Envoy.blade.php
index 4087e3e..2729954 100644
--- a/Envoy.blade.php
+++ b/Envoy.blade.php
@@ -60,23 +60,33 @@
 @endstory
 
 @task('clone_repository', ['on' => 'localhost'])
-    echo 'Cloning repository'
     [ -d {{ $app_dir }} ] || mkdir {{ $app_dir }}
     [ -d {{ $releases_dir }} ] || mkdir {{ $releases_dir }}
     
     @if($commit)
-        echo '克隆分支 {{ $branch }} 提交 ID {{ $commit }} 到 {{ $new_release_dir }}'
-        mkdir {{ $new_release_dir }}
-        cd {{ $new_release_dir }}
-        git init
-        git remote add origin {{ $repository }}
-        git fetch --depth 1 origin {{ $commit }}
-        git checkout FETCH_HEAD
+        @if($project_dir)
+            echo 'Copy repository from workspace'
+            cp -r {{ $project_dir }} {{ $new_release_dir }}
+        @else
+            echo 'Clone branch {{ $branch }} to {{ $new_release_dir }} with all commits'
+            mkdir {{ $new_release_dir }}
+            cd {{ $new_release_dir }}
+            git init
+            git remote add origin {{ $repository }}
+            git fetch origin {{ $branch }}
+        @endif
+
+        echo 'Checkout {{ $commit }}'
+        git checkout {{ $commit }}
     @else
-        echo '克隆分支 {{ $branch }} 到 {{ $new_release_dir }}'
+        echo 'Clone {{ $branch }} to {{ $new_release_dir }} with 1 depth'
         git clone -b {{ $branch }} --depth 1 {{ $repository }} {{ $new_release_dir }}
     @endif
 
+    echo 'Remove .git directory'
+    cd {{ $new_release_dir }}
+    rm -rf .git
+
 @endtask
 
 @task('run_composer', ['on' => 'localhost'])