1
0
Fork 0
mirror of https://github.com/morpheus65535/bazarr synced 2024-12-25 17:17:12 +00:00

Improvement to update mechanism

This commit is contained in:
Louis Vézina 2017-12-05 14:14:51 -05:00
parent 8db5f33873
commit 29ac49c959

View file

@ -20,7 +20,7 @@ def check_and_apply_update(repo=local_repo, remote_name='origin'):
# We can just fastforward # We can just fastforward
elif merge_result & pygit2.GIT_MERGE_ANALYSIS_FASTFORWARD: elif merge_result & pygit2.GIT_MERGE_ANALYSIS_FASTFORWARD:
repo.checkout_tree(repo.get(remote_id)) repo.checkout_tree(repo.get(remote_id))
master_ref = repo.lookup_reference('refs/heads/' + branch) master_ref = repo.lookup_reference('refs/remotes/origin/' + str(branch))
master_ref.set_target(remote_id) master_ref.set_target(remote_id)
repo.head.set_target(remote_id) repo.head.set_target(remote_id)
result = 'Bazarr updated to latest version and restarting.' result = 'Bazarr updated to latest version and restarting.'