|
|
|
@ -20,7 +20,7 @@ def check_and_apply_update(repo=local_repo, remote_name='origin'):
|
|
|
|
|
# We can just fastforward
|
|
|
|
|
elif merge_result & pygit2.GIT_MERGE_ANALYSIS_FASTFORWARD:
|
|
|
|
|
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)
|
|
|
|
|
repo.head.set_target(remote_id)
|
|
|
|
|
result = 'Bazarr updated to latest version and restarting.'
|
|
|
|
|