From e62466bcea68f20edb37d28557d11101171d844e Mon Sep 17 00:00:00 2001 From: Frank Lee Date: Fri, 18 Aug 2023 21:29:06 +0800 Subject: [PATCH] [docer] removed the branch update method (#191) --- doc-build/docer/core/docs.py | 2 +- doc-build/docer/core/git.py | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/doc-build/docer/core/docs.py b/doc-build/docer/core/docs.py index b5b90444..8bae2358 100644 --- a/doc-build/docer/core/docs.py +++ b/doc-build/docer/core/docs.py @@ -19,7 +19,7 @@ def setup(self): self.cache_directory.mkdir(exist_ok=True, parents=True) if self.git_client.repo_directory.exists(): - self.git_client.merge_origin_main() + pass else: self.git_client.clone() diff --git a/doc-build/docer/core/git.py b/doc-build/docer/core/git.py index d58a2956..e833dea5 100644 --- a/doc-build/docer/core/git.py +++ b/doc-build/docer/core/git.py @@ -12,12 +12,6 @@ def __init__(self, root_directory: str, owner: str, project: str): self.git_url = f'https://github.com/{owner}/{project}.git' self.repo_directory = self.root_directory.joinpath(project) - def merge_origin_main(self): - with self._change_dir(self.repo_directory): - subprocess.check_call(['git', 'checkout', 'main']) - subprocess.check_call(['git', 'fetch', 'origin']) - subprocess.check_call(['git', 'merge', 'origin/main']) - def clone(self): with self._change_dir(self.root_directory): subprocess.check_call(['git', 'clone', self.git_url])