From e3757c568abdfb0ce8615fdf4f04437c282d6313 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 20 Mar 2019 12:34:16 +0800 Subject: [PATCH] Git.vala --- Git.vala | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Git.vala b/Git.vala index 957eff7e..bb12e3d7 100644 --- a/Git.vala +++ b/Git.vala @@ -232,6 +232,10 @@ namespace GitLive { var treeoid = ix.write_tree(); var new_tree = this.repo.lookup(treeoid,typeof (Ggit.Tree)) as Ggit.Tree; + + var parent = new_head.lookup() as Ggit.Commit; + Ggit.Commit[] parents = Ggit.Commit[] { parent }; + this.repo.create_commit(this.head.get_name(), sig, sig, null, "Test Merge", new_tree, parents); -- 2.39.2