diff options
| -rw-r--r-- | app/Controllers/updateController.php | 8 | ||||
| -rw-r--r-- | data/users/.gitignore | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php index c67b358bb..2be644c85 100644 --- a/app/Controllers/updateController.php +++ b/app/Controllers/updateController.php @@ -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()); } diff --git a/data/users/.gitignore b/data/users/.gitignore index 3705c06b7..03ee0bd34 100644 --- a/data/users/.gitignore +++ b/data/users/.gitignore @@ -1,5 +1,5 @@ */ */config.php -*/db.sqlite +*/*.sqlite !_/ */log*.txt |