From 5ff6cdd53b0c5020fdc9752c6d7c92dc9d0b247a Mon Sep 17 00:00:00 2001 From: proletarius101 Date: Mon, 3 Jun 2024 00:51:54 +0800 Subject: [PATCH] fix(deploy): all files are uploaded if the index only mode deployment follows a full mode one create new branches from groud up --- fdroidserver/deploy.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fdroidserver/deploy.py b/fdroidserver/deploy.py index b00fbdc7..87f4bb4c 100644 --- a/fdroidserver/deploy.py +++ b/fdroidserver/deploy.py @@ -707,7 +707,7 @@ def update_servergitmirrors(servergitmirrors, repo_section): progress=progress) # Switch to the initial branch - repo.git.checkout(GIT_BRANCH) + repo.git.switch(GIT_BRANCH) if progress: progressbar.done() @@ -736,7 +736,7 @@ def upload_to_servergitmirror(mirror_config: Dict[str, str], if local_branch_name in local_repo.heads: local_repo.git.switch(local_branch_name) else: - local_repo.git.switch('-c', local_branch_name) + local_repo.git.switch('--orphan', local_branch_name) remote_branch_name = GIT_BRANCH remote_url = mirror_config['url']