opensourcemirror
/
fdroid-server
mirror of https://gitlab.com/fdroid/fdroidserver.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(deploy): error: The branch 'full' is not fully merged.

This commit is contained in:
proletarius101 2024-04-06 16:49:24 +08:00
parent d9984dbeea
commit cd23cf659b
No known key found for this signature in database
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdroidserver/deploy.py
View File

@ -602,7 +602,7 @@ def update_servergitmirrors(servergitmirrors, repo_section):
# Switch to the initial branch and unstage all files
repo.head.reference = initial_branch_ref
repo.head.reset(index=True, working_tree=False)
repo.delete_head(repo.branches[branch_name])
repo.delete_head(repo.branches[branch_name], force=True)
if progress:
progressbar.done()