mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-25 00:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

git clean before git auto-update (#2036)

Browse Source 
* git clean before git auto-update

To avoid https://github.com/FreshRSS/FreshRSS/issues/2012 in the future

* More generic SQLite file filter

* Another -f

https://git-scm.com/docs/git-clean
This commit is contained in:
Alexandre Alapetite
2018-09-30 18:04:49 +02:00
committed by GitHub
parent eb5e21944d
commit 83756c657f
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Controllers/updateController.php
View File

@@ -32,7 +32,13 @@ class FreshRSS_update_Controller extends Minz_ActionController {
$output = array();
$return = 1;
try {
exec('git pull --ff-only', $output, $return);
exec('git clean -f -d -f', $output, $return);
if ($return == 0) {
exec('git pull --ff-only', $output, $return);
} else {
$line = is_array($output) ? implode('; ', $output) : '' . $output;
Minz_Log::warning('git clean warning:' . $line);
}
} catch (Exception $e) {
Minz_Log::warning('git pull error:' . $e->getMessage());
}