lywsvip/codefever
1
0
Fork 0
mirror of https://github.com/PGYER/codefever.git synced 2026-05-06 21:50:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(Git Command): add space chars (\s) support (github #53)

Browse Source 
github #53
This commit is contained in:
cubic
2022-03-11 16:00:42 +08:00
parent 66d9a21f92
commit 20d25b6237
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/libraries/service/Utility/Command.php
View File

@@ -42,8 +42,8 @@ class Command
// return '"' . $argument . '"';
$pattern = [
'/(^|[^\\\\])((\\\\\\\\)*[\'\"\$\|])/',
'/(^|[^\\\\])((\\\\\\\\)*\\\\([^\'\"\|\$\\\\]|$))/'
'/(^|[^\\\\])((\\\\\\\\)*[\s\'\"\$\|])/',
'/(^|[^\\\\])((\\\\\\\\)*\\\\([^\s\'\"\|\$\\\\]|$))/'
];
$replacement = [
'$1\\\\$2',

5
application/models/repository_model.php
View File

@@ -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;