projects
/
gitlive
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
546016f
)
Git.vala
author
Alan Knowles
<alan@roojs.com>
Fri, 15 Mar 2019 03:33:54 +0000
(11:33 +0800)
committer
Alan Knowles
<alan@roojs.com>
Fri, 15 Mar 2019 03:33:54 +0000
(11:33 +0800)
Git.vala
patch
|
blob
|
history
diff --git
a/Git.vala
b/Git.vala
index
304208d
..
b219be4
100644
(file)
--- 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 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);
+
}
}