From: Alan Knowles <alan@roojs.com>
Date: Fri, 15 Mar 2019 03:33:54 +0000 (+0800)
Subject: Git.vala
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=8c3b8bc4506f39e4579f134e40eb5d46c850ba75

Git.vala
---

diff --git a/Git.vala b/Git.vala
index 304208de..b219be4e 100644
--- a/Git.vala
+++ b/Git.vala
@@ -206,7 +206,21 @@ namespace  GitLive {
 			var mo = new Ggit.MergeOptions();
 			mo.set_file_favor(Ggit.MergeFileFavor.THEIRS);
 			var ix  = this.repo.merge_trees(anc_tree, master_tree, head_tree, mo);
+			 var treeoid = ix.write_tree();
+			 
+			 
+			  
+			var parents =   new Ggit.Commit[] { master_commit };
+
+
+			var new_tree = this.repo.lookup(treeoid,typeof (Ggit.Tree))  as   Ggit.Tree;
 			
+			var sig = new Ggit.Signature.now(
+					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);
+	
 		
 		}