From 20d25b623762d5722c381edcfdea8f7c42a236a3 Mon Sep 17 00:00:00 2001
From: cubic <carneywu@pgyer.com>
Date: Fri, 11 Mar 2022 16:00:42 +0800
Subject: [PATCH] fix(Git Command): add space chars (\s) support (github #53)

github #53
---
 application/libraries/service/Utility/Command.php | 4 ++--
 application/models/repository_model.php           | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/application/libraries/service/Utility/Command.php b/application/libraries/service/Utility/Command.php
index e01c87b..9718c3d 100755
--- a/application/libraries/service/Utility/Command.php
+++ b/application/libraries/service/Utility/Command.php
@@ -42,8 +42,8 @@ class Command
         // return '"' . $argument . '"';
 
         $pattern = [
-            '/(^|[^\\\\])((\\\\\\\\)*[\'\"\$\|])/',
-            '/(^|[^\\\\])((\\\\\\\\)*\\\\([^\'\"\|\$\\\\]|$))/'
+            '/(^|[^\\\\])((\\\\\\\\)*[\s\'\"\$\|])/',
+            '/(^|[^\\\\])((\\\\\\\\)*\\\\([^\s\'\"\|\$\\\\]|$))/'
         ];
         $replacement = [
             '$1\\\\$2',
diff --git a/application/models/repository_model.php b/application/models/repository_model.php
index b359fc5..1c3eb98 100755
--- a/application/models/repository_model.php
+++ b/application/models/repository_model.php
@@ -1413,7 +1413,7 @@ class Repository_model extends CI_Model
             return FALSE;
         }
 
-        $revision =   Command::wrapArgument($revision);
+        $revision = Command::wrapArgument($revision);
         $filepath = Command::wrapArgument($filepath);
 
         // create target repository workspace
@@ -1465,6 +1465,9 @@ class Repository_model extends CI_Model
             return FALSE;
         }
 
+        $branch = Command::wrapArgument($branch);
+        $filePath = Command::wrapArgument($filePath);
+
         $command = GitCommand::getLastLog($branch, $filePath, $lastSha);
         if (!$command) {
             return FALSE;