diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-11-04 18:05:20 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-11-04 18:05:20 +0100 |
| commit | 2495172a05725684fa4db2ed3417461d386c5cbf (patch) | |
| tree | 2ab73be54acf5685f29715666b6f55bae88add2d /app | |
| parent | 7819a43197d34ef7a6c5626e9e48d7db075c37c9 (diff) | |
Better git fetch (#2626)
Related to https://github.com/FreshRSS/FreshRSS/pull/2625
If for some reasons branches have diverged:, e.g.:
```
$ git status -sb --porcelain remote
## dev...origin/dev [ahead 4, behind 1]
```
Diffstat (limited to 'app')
| -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 cc3aef9fd..c0c1ef1c8 100644 --- a/app/Controllers/updateController.php +++ b/app/Controllers/updateController.php @@ -23,7 +23,7 @@ class FreshRSS_update_Controller extends Minz_ActionController { } chdir($cwd); $line = is_array($output) ? implode('; ', $output) : '' . $output; - return strpos($line, '[behind') !== false; + return strpos($line, '[behind') !== false || strpos($line, '[ahead') !== false; } public static function gitPull() { |