diff options
| author | BoYanZh <32470225+BoYanZh@users.noreply.github.com> | 2020-10-02 02:28:25 +0800 |
|---|---|---|
| committer | BoYanZh <32470225+BoYanZh@users.noreply.github.com> | 2020-10-02 02:28:25 +0800 |
| commit | d81ddbf59fb1ecee6b916e9b0124f50f9405fa96 (patch) | |
| tree | 799a9215ac1506bf746dc9f04b3f7bc098f3c893 | |
| parent | 126a4e5114be8a2f31d3325f001bc4cc68b42fcf (diff) | |
fix: proj repo checkout
| -rw-r--r-- | worker/GiteaWorker.py | 6 |
1 files changed, 4 insertions, 2 deletions
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))): |