From 9cd5a5d3049480a82cd7fb9ff2aadac340189235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20V=C3=A9zina?= <5130500+morpheus65535@users.noreply.github.com> Date: Tue, 21 Nov 2017 16:10:20 -0500 Subject: [PATCH] Better error management --- check_update.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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