From: Alan Knowles <alan@roojs.com>
Date: Wed, 20 Mar 2019 04:32:28 +0000 (+0800)
Subject: Git.vala
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=d42715cf86ebb6e6e8c9453fec64ea126ca13045

Git.vala
---

diff --git a/Git.vala b/Git.vala
index 22ac6a3f..f64c6381 100644
--- 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);