Merge pull request #1973 from phl0/moreDebug
Make sure git can be executed before using its results
这个提交包含在:
当前提交
a7a0b9610f
共有 1 个文件被更改,包括 16 次插入 和 13 次删除
|
|
@ -159,9 +159,10 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<?php if (file_exists('.git')) { ?>
|
<?php if (file_exists('.git')) { ?>
|
||||||
<div class="card">
|
|
||||||
<?php
|
<?php
|
||||||
$commitHash = trim(exec('git log --pretty="%H" -n1 HEAD'));
|
$commitHash = trim(exec('git log --pretty="%H" -n1 HEAD'));
|
||||||
|
// only proceed here if git can actually be executed
|
||||||
|
if ($commitHash != "") {
|
||||||
$commitDate = trim(exec('git log --pretty="%ci" -n1 HEAD'));
|
$commitDate = trim(exec('git log --pretty="%ci" -n1 HEAD'));
|
||||||
$line = trim(exec('git log -n 1 --pretty=%D HEAD'));
|
$line = trim(exec('git log -n 1 --pretty=%D HEAD'));
|
||||||
$pieces = explode(', ', $line);
|
$pieces = explode(', ', $line);
|
||||||
|
|
@ -175,7 +176,9 @@
|
||||||
$owner = preg_replace('/git@github\.com:(\w+)\/Cloudlog\.git/', '$1', $url);
|
$owner = preg_replace('/git@github\.com:(\w+)\/Cloudlog\.git/', '$1', $url);
|
||||||
}
|
}
|
||||||
$tag = trim(exec('git describe --tags '.$commitHash));
|
$tag = trim(exec('git describe --tags '.$commitHash));
|
||||||
|
}
|
||||||
?>
|
?>
|
||||||
|
<div class="card">
|
||||||
<div class="card-header">Git Information</div>
|
<div class="card-header">Git Information</div>
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<table width="100%">
|
<table width="100%">
|
||||||
|
|
|
||||||
正在加载…
在新工单中引用