Better error management

7 years ago · 9cd5a5d304
parent 6c5419716d
commit 9cd5a5d304
1 changed files with 2 additions and 1 deletions
--- 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