1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-09-21 04:10:37 +02:00

fix(deploy): all files are uploaded if the index only mode deployment follows a full mode one

create new branches from groud up
This commit is contained in:
proletarius101 2024-06-03 00:51:54 +08:00
parent b74c848d6e
commit 5ff6cdd53b
No known key found for this signature in database

View File

@ -707,7 +707,7 @@ def update_servergitmirrors(servergitmirrors, repo_section):
progress=progress) progress=progress)
# Switch to the initial branch # Switch to the initial branch
repo.git.checkout(GIT_BRANCH) repo.git.switch(GIT_BRANCH)
if progress: if progress:
progressbar.done() progressbar.done()
@ -736,7 +736,7 @@ def upload_to_servergitmirror(mirror_config: Dict[str, str],
if local_branch_name in local_repo.heads: if local_branch_name in local_repo.heads:
local_repo.git.switch(local_branch_name) local_repo.git.switch(local_branch_name)
else: else:
local_repo.git.switch('-c', local_branch_name) local_repo.git.switch('--orphan', local_branch_name)
remote_branch_name = GIT_BRANCH remote_branch_name = GIT_BRANCH
remote_url = mirror_config['url'] remote_url = mirror_config['url']