diff options
| author | Alexandre Alapetite <alexandre@alapetite.fr> | 2021-06-07 23:10:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-07 23:10:25 +0200 |
| commit | c5ca73706277486ed59e4581bfa42cc127726b38 (patch) | |
| tree | 359218d1cf11c6118e557394d7feae6e9ebe46b1 /app/Controllers/updateController.php | |
| parent | 70d8935a1b6a2947d087bcd84a67efbb0877dfbb (diff) | |
| download | freshrss-c5ca73706277486ed59e4581bfa42cc127726b38.tar.gz freshrss-c5ca73706277486ed59e4581bfa42cc127726b38.zip | |
Git 2.21 compatiblity (#3669)
#fix https://github.com/FreshRSS/FreshRSS/issues/3665
`git branch --show-current` requires git 2.22+
https://stackoverflow.com/questions/1417957/show-just-the-current-branch-in-git
Diffstat (limited to 'app/Controllers/updateController.php')
| -rw-r--r-- | app/Controllers/updateController.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php index 6f947d0c6..862fb0cf9 100644 --- a/app/Controllers/updateController.php +++ b/app/Controllers/updateController.php @@ -16,7 +16,8 @@ class FreshRSS_update_Controller extends Minz_ActionController { throw new Exception($errorMessage); } - exec('git branch --show-current', $output, $return); + //Note `git branch --show-current` requires git 2.22+ + exec('git symbolic-ref --short HEAD', $output, $return); if ($return != 0) { throw new Exception($errorMessage); } |