diff --git a/check_update.py b/check_update.py index 5629623bf..1360fe4d3 100644 --- a/check_update.py +++ b/check_update.py @@ -40,8 +40,9 @@ def check_and_apply_update(repo=local_repo, remote_name='origin'): user, 'Merge!', tree, - [repo.head.target, remote_master_id]) + [repo.head.target, remote_id]) repo.state_cleanup() else: raise AssertionError('Unknown merge analysis result') + return result