projects
/
gitlive
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Git.vala
[gitlive]
/
Git.vala
diff --git
a/Git.vala
b/Git.vala
index
957eff7
..
bb12e3d
100644
(file)
--- a/
Git.vala
+++ b/
Git.vala
@@
-232,6
+232,10
@@
namespace GitLive {
var treeoid = ix.write_tree();
var new_tree = this.repo.lookup(treeoid,typeof (Ggit.Tree)) as Ggit.Tree;
var treeoid = ix.write_tree();
var new_tree = this.repo.lookup(treeoid,typeof (Ggit.Tree)) as Ggit.Tree;
+
+ var parent = new_head.lookup() as Ggit.Commit;
+ Ggit.Commit[] parents = Ggit.Commit[] { parent };
+
this.repo.create_commit(this.head.get_name(), sig, sig, null, "Test Merge", new_tree, parents);
this.repo.create_commit(this.head.get_name(), sig, sig, null, "Test Merge", new_tree, parents);