Merge branch 'feature/ImpoveCheckout' into develop

5 years ago · 42ec370bc6
1 changed files with 3 additions and 2 deletions
--- a/sickbeard/version_checker.py
+++ b/sickbeard/version_checker.py
@ -402,8 +402,9 @@ class GitUpdateManager(UpdateManager):
                                                         % (sickbeard.GIT_REMOTE, self._cur_pr_number, self.branch))

        else:
-            output, err, exit_status = self._run_git(self._git_path, 'checkout -f %s'
-                                                     % self.branch)
+            output, err, exit_status = self._run_git(self._git_path, 'fetch %s' % sickbeard.GIT_REMOTE)
+            output, err, exit_status = self._run_git(self._git_path, 'checkout -f -B "%s" "%s/%s"'
+                                                     % (self.branch, sickbeard.GIT_REMOTE, self.branch))

        if 0 == exit_status:
            self._find_installed_version()