monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-11-14 17:05:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change prevent git update issue.

Browse source 
Add '--no-rebase' to git pull (update) command to prevent issues with git 2.37+
This commit is contained in:
Prinz23 2024-02-13 11:34:32 +01:00 committed by JackDandy
parent 9f4be5238d
commit 7f51b9ce4d
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGES.md
View file

@ -1,4 +1,9 @@
### 3.30.9 (2024-02-07 23:10:00 UTC)
### 3.30.10 (2024-02-13 11:00:00 UTC)
* Change prevent git update issue
### 3.30.9 (2024-02-07 23:10:00 UTC)
* Change allow Python 3.12.2

5
sickgear/version_checker.py
View file

@ -601,9 +601,10 @@ class GitUpdateManager(UpdateManager):
if self.branch == self._find_installed_branch():
if not self._cur_pr_number:
_, _, exit_status = self._run_git(['pull', '-f', '%s' % sickgear.GIT_REMOTE, '%s' % self.branch])
_, _, exit_status = self._run_git(['pull', '-f', '--no-rebase', '%s' % sickgear.GIT_REMOTE,
'%s' % self.branch])
else:
_, _, exit_status = self._run_git(['pull', '-f', '%s' % sickgear.GIT_REMOTE,
_, _, exit_status = self._run_git(['pull', '-f', '--no-rebase', '%s' % sickgear.GIT_REMOTE,
'pull/%s/head:%s' % (self._cur_pr_number, self.branch)])
else: