Cadoles
/
formations
20
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Attempt to rebase

This commit is contained in:
Benjamin Bohard 2020-09-07 19:21:23 +02:00
parent b6a5963a3e
commit 70ad496b06
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
setup_main_tex_file.py
View File

@ -110,6 +110,14 @@ def git_integration(func):
tree,
parents)
basket = repo.branches.get(branch_name)
cherry = repo.lookup_branch('refs/heads/master').target
base = repo.merge_base(cherry, basket.target)
base_tree = cherry.parents[0].tree
index = repo.merge_trees(base_tree, basket, cherry)
tree_id = index.write_tree(repo)
repo.create_commit(basket.name, author, committer, 'bof', tree_id, [basket.target])
return inner