diff options
| author |  Alexis Degrugillier <aledeg@users.noreply.github.com>
| 2019-04-03 17:45:03 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-04-03 17:45:03 +0200 |
| commit | 59b326040ada9faf363fe74d05760a296a512632 (patch) | |
| tree | 77e0d0237da94c47d3ddb0954d263b19d4e3d915 /app/Controllers/updateController.php | |
| parent | 461a88657cccb7c4d1a89194397a7dd5f4032c6d (diff) | |
| parent | 0eea6d5ab5098d5203877a5beacfac2e1311c5f8 (diff) | |
Merge pull request #2333 from FreshRSS/revert-2331-feature/clean-update
Revert "Update git command"
Diffstat (limited to 'app/Controllers/updateController.php')
| -rw-r--r-- | app/Controllers/updateController.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php index 46157960d..2be644c85 100644 --- a/app/Controllers/updateController.php +++ b/app/Controllers/updateController.php @@ -32,7 +32,7 @@ class FreshRSS_update_Controller extends Minz_ActionController { $output = array(); $return = 1; try { - exec('git clean -d --force', $output, $return); + exec('git clean -f -d -f', $output, $return); if ($return == 0) { exec('git pull --ff-only', $output, $return); } else { |