Git.vala

[gitlive] / Git.vala

diff --git a/Git.vala b/Git.vala
index bb12e3d..ec647aa 100644 (file)
--- a/Git.vala
+++ b/Git.vala
@@ -90,9 +90,9 @@ namespace  GitLive {
                                var br = r.get() as Ggit.Branch;
                                //var head = this.repo.revparse("refs/heads/" + br.get_name() ).get_id();
                                //var rhead = this.repo.revparse(br.get_upstream().get_name() ).get_id();
-                               //GLib.debug("got branch: name = %s upstream = %s oid = %s ", 
-                               //              br.get_name(), br.get_upstream().get_name(), 
-                               //              head.to_string());
+                                 GLib.debug("got branch: name = %s upstream = %s oid = %s ", 
+                                               br.get_name(), br.get_upstream().get_name(), 
+                                       head.to_string());
                                this.branches.add(br);
                                if (br.is_head()) {
                                        GLib.debug("HEAD= %s", br.get_name());
@@ -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();
@@ -234,11 +235,10 @@ namespace  GitLive {
                        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 };
+                       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);
         
-               
                }