From 7f51b9ce4d5d1ebc3c00d6c1003e40f25640b1e5 Mon Sep 17 00:00:00 2001 From: Prinz23 Date: Tue, 13 Feb 2024 11:34:32 +0100 Subject: [PATCH] Change prevent git update issue. Add '--no-rebase' to git pull (update) command to prevent issues with git 2.37+ --- CHANGES.md | 7 ++++++- sickgear/version_checker.py | 5 +++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index e7566618..4a7ce6d8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -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 diff --git a/sickgear/version_checker.py b/sickgear/version_checker.py index 3f0ea6df..0541cefa 100644 --- a/sickgear/version_checker.py +++ b/sickgear/version_checker.py @@ -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: