sync

[gitlive] / Git.vala

diff --git a/Git.vala b/Git.vala
index b4cc84c..6207008 100644 (file)
--- a/Git.vala
+++ b/Git.vala
@@ -186,9 +186,7 @@ namespace  GitLive {
                        
                        
                        this.repo.create_commit("HEAD", sig, sig, null, "Test Merge", new_tree, parents);
-       
-                       
-                       
+        
                        
                        
                }
@@ -219,9 +217,12 @@ namespace  GitLive {
                        var commits =   new Ggit.AnnotatedCommit[] { ac };
                        
                        this.repo.merge(commits, mo, co);
+                       
+                       var cfg = this.repo.get_config().snapshot();
+                       
                    var sig = new Ggit.Signature.now(
-                                       this.repo.get_config().get_string("user.name"),
-                                       this.repo.get_config().get_string("user.email")
+                                       cfg.get_string("user.name"),
+                                       cfg.get_string("user.email")
                        );
                        var new_head = this.repo.get_head();
                        var oid = new_head.get_target();
@@ -236,9 +237,8 @@ namespace  GitLive {
                        var parent = new_head.lookup() as Ggit.Commit;
                        Ggit.Commit[] parents =  new Ggit.Commit[] { parent };
                        
-                       this.repo.create_commit(this.head.get_name(), sig, sig, null, "Test Merge", new_tree, parents);
+                       this.repo.create_commit("refs/heads/" + this.head.get_name(), sig, sig, null, "Test Merge", new_tree, parents);
         
-               
                }