Git.vala
authorAlan Knowles <alan@roojs.com>
Wed, 20 Mar 2019 04:34:16 +0000 (12:34 +0800)
committerAlan Knowles <alan@roojs.com>
Wed, 20 Mar 2019 04:34:16 +0000 (12:34 +0800)
Git.vala

index 957eff7..bb12e3d 100644 (file)
--- 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);