mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-18 13:24:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Better git fetch (#2626)

Browse Source 
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]
```
This commit is contained in:
Alexandre Alapetite
2019-11-04 18:05:20 +01:00
committed by GitHub
parent 7819a43197
commit 2495172a05
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controllers/updateController.php
View File

@@ -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() {