Git.vala

[gitlive] / Git.vala

diff --git a/Git.vala b/Git.vala
index f64c638..bb12e3d 100644 (file)
--- a/Git.vala
+++ b/Git.vala
@@ -231,8 +231,12 @@ namespace  GitLive {
                        ix.write();
                        var treeoid = ix.write_tree();
 
-                       var new_tree = a.repo.lookup(treeoid,typeof (Ggit.Tree))  as   Ggit.Tree;
-                       this.repo.create_commit("HEAD", sig, sig, null, "Test Merge", new_tree, parents);
+                       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);
         
                
                }