From 51ed72efab87c840e1f1bad8ea61712928aeec92 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 2 Mar 2021 07:35:20 +0300 Subject: [PATCH] use dash instead of space when invoking git to get version --- classes/config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/config.php b/classes/config.php index 0f20fa27c..8761863f5 100644 --- a/classes/config.php +++ b/classes/config.php @@ -182,7 +182,7 @@ class Config { "timestamp" => 0, ]; - $proc = proc_open("git --no-pager log --pretty=\"%ct %h\" -n1 HEAD", + $proc = proc_open("git --no-pager log --pretty=\"%ct-%h\" -n1 HEAD", $descriptorspec, $pipes, $dir); if (is_resource($proc)) { @@ -193,7 +193,7 @@ class Config { $rv["status"] = $status; if ($status == 0) { - list($timestamp, $commit) = explode(" ", $stdout); + list($timestamp, $commit) = explode("-", $stdout); $rv["version"] = strftime("%y.%m", (int)$timestamp) . "-$commit"; $rv["commit"] = $commit;