Attempt to rebase

2020-09-07 19:21:23 +02:00 · 2020-09-07 19:21:23 +02:00 · 70ad496b06
commit 70ad496b06
parent b6a5963a3e
1 changed files with 8 additions and 0 deletions
--- a/setup_main_tex_file.py
+++ b/setup_main_tex_file.py
@ -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