From efcf0f772ec4068ee238bf173d3802fce9af7bae Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Sep 2019 01:50:36 +0900
Subject: [PATCH] =?UTF-8?q?server=20checkout=20=EC=B6=94=EA=B0=802?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 j_updateServer.php | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/j_updateServer.php b/j_updateServer.php
index 7f68763c..f016e574 100644
--- a/j_updateServer.php
+++ b/j_updateServer.php
@@ -58,12 +58,13 @@ if(!$allowUpdate){
     ]);
 }
 
+$src_target = $storage->$server;
+if($src_target){
+    $src_target = $src_target[0];
+}
 
 if(!$allowFullUpdate || !$target){
-    $target = $storage->$server;
-    if($target){
-        $target = $target[0];
-    }
+    $target = $src_target;
 }
 else{
     $target = $request['target'];
@@ -122,6 +123,17 @@ if($server == $baseServerName){
         ]);
     }
 
+    if($target != $src_target){
+        $command = sprintf('git checkout %s -q 2>&1', $target);
+        exec($command, $output);
+        if($output){
+            Json::die([
+                'result'=>false,
+                'reason'=>join(', ', $output)
+            ]);
+        }
+    }
+
     $version = getVersion();
     $result = Util::generateFileUsingSimpleTemplate(
         __DIR__.'/'.$server.'/d_setting/VersionGit.orig.php',