Unknown reference
This commit is contained in:
parent
7e0d5c15e5
commit
30a6389514
|
@ -149,6 +149,7 @@ def git_integration(func):
|
||||||
master_head = commit_into_master(master_add_paths, repo, comment)
|
master_head = commit_into_master(master_add_paths, repo, comment)
|
||||||
else:
|
else:
|
||||||
master_head = repo.revparse_single('refs/heads/master')
|
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):
|
if master_head not in repo.walk(branch_ref.target):
|
||||||
merge_master_into_branch(master_head, branch_name, repo)
|
merge_master_into_branch(master_head, branch_name, repo)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue