From d42715cf86ebb6e6e8c9453fec64ea126ca13045 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 20 Mar 2019 12:32:28 +0800 Subject: [PATCH] Git.vala --- Git.vala | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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); -- 2.39.2