From 30a638951470f3a0983cffb7a2e67d72d335a72b Mon Sep 17 00:00:00 2001 From: Benjamin Bohard Date: Fri, 29 Jan 2021 14:34:18 +0100 Subject: [PATCH] Unknown reference --- setup_main_tex_file.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup_main_tex_file.py b/setup_main_tex_file.py index be8b295..b0ffe7d 100755 --- a/setup_main_tex_file.py +++ b/setup_main_tex_file.py @@ -149,6 +149,7 @@ def git_integration(func): master_head = commit_into_master(master_add_paths, repo, comment) else: master_head = repo.revparse_single('refs/heads/master') + branch_ref = repo.references[f'refs/heads/{branch_name}'] if master_head not in repo.walk(branch_ref.target): merge_master_into_branch(master_head, branch_name, repo)