From ac145a4e63636e535e3e7192ba843ba4ce98f580 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 21 Oct 2019 10:39:27 +0800
Subject: [PATCH] =?UTF-8?q?fork=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/shixuns_controller.rb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 76ba2a1f4..05c3500ee 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -232,10 +232,12 @@ class ShixunsController < ApplicationController
 
 				# 同步私密版本库
 				if @shixun.shixun_secret_repository
-					repo_name = "#{current_user.login}/secret_#{@shixun.identifier}"
+					# 源仓库的的私密版本库地址
+					repo_name = @shixun.shixun_secret_repository.repo_name
+					# 新生成的地址
 					fork_repository_name = "#{current_user.login}/secret_#{@new_shixun.identifier}"
 					ShixunSecretRepository.create!(shixun_id: @new_shixun.id,
-																				 repo_name: "#{repo_name}",
+																				 repo_name: "#{fork_repository_name}",
 																				 secret_dir_path: @shixun.shixun_secret_repository.secret_dir_path)
 					GitService.fork_repository(repo_path: "#{repo_name}.git", fork_repository_path: (fork_repository_name + ".git"))
 				end
@@ -335,7 +337,10 @@ class ShixunsController < ApplicationController
 				end
 			rescue Exception => e
 				uid_logger_error("copy shixun failed ##{e.message}")
-				g.delete_project(gshixungshixun.id) if gshixun.try(:id).present?  # 异常后，如果已经创建了版本库需要删除该版本库
+				# 删除版本库
+				# 删除私密版本库
+				GitService.delete_repository(repo_path: "#{fork_repository_name}.git") if @new_shixun.shixun_secret_repository&.repo_name
+				GitService.delete_repository(repo_path: @new_shixun.repo_path) if @new_shixun.repo_path
 				tip_exception("实训Fork失败")
 				raise ActiveRecord::Rollback
 			end