Git.vala

diff --git a/Git.vala b/Git.vala
index 22ac6a3..f64c638 100644 (file)
--- a/Git.vala
+++ b/Git.vala
@@ -182,6 +182,9 @@ namespace  GitLive {
                                        this.repo.get_config().get_string("user.name"),
                                        this.repo.get_config().get_string("user.email")
                        );
+                       
+                       
+                       
                        this.repo.create_commit("HEAD", sig, sig, null, "Test Merge", new_tree, parents);
        
                        
@@ -221,7 +224,14 @@ namespace  GitLive {
                                        this.repo.get_config().get_string("user.email")
                        );
                        var new_head = this.repo.get_head();
-                       
+                       var oid = new_head.get_target();
+
+                       var ix = this.repo.get_index();
+ 
+                       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);