From d81ddbf59fb1ecee6b916e9b0124f50f9405fa96 Mon Sep 17 00:00:00 2001
From: BoYanZh <32470225+BoYanZh@users.noreply.github.com>
Date: Fri, 2 Oct 2020 02:28:25 +0800
Subject: fix: proj repo checkout

---
 worker/GiteaWorker.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'worker')

diff --git a/worker/GiteaWorker.py b/worker/GiteaWorker.py
index 6dac863..d7677c8 100644
--- a/worker/GiteaWorker.py
+++ b/worker/GiteaWorker.py
@@ -150,11 +150,13 @@ class GiteaWorker():
         else:
             repo = git.Repo(os.path.join('projrepos', f'p{projNum}', repoName))
             repo.git.fetch()
-            if 'master' not in [branch.name for branch in repo.branches]:
+            remoteBranches = [ref.name for ref in repo.remote().refs]
+            if 'origin/master' not in remoteBranches:
                 self.logger.warning(f"{repoName} branch master missing")
                 return
-            repo.git.reset('--hard')
+            repo.git.checkout(f"master", "-f")
             repo.git.pull("origin", "master", "--rebase", "-f")
+            repo.git.reset('--hard')
         if not list(
                 filter(lambda x: x.lower().startswith('readme'),
                        os.listdir(repoDir))):
-- 
cgit v1.2.3