sync

[gitlive] / Git.vala

diff --git a/Git.vala b/Git.vala
index 8141f8e..6207008 100644 (file)
--- a/Git.vala
+++ b/Git.vala
@@ -182,11 +182,12 @@ 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);
-       
                        
                        
                        
+                       this.repo.create_commit("HEAD", sig, sig, null, "Test Merge", new_tree, parents);
+        
+                       
                        
                }
                public void mergeMasterIntoHead()
@@ -195,7 +196,8 @@ namespace  GitLive {
                        this.loadLocalBranches();
                        GLib.debug("head rev = %s", this.head.get_name());
                        var head_oid =  this.repo.revparse(this.head.get_name() ).get_id()  ;
-                       var master_oid =  this.repo.revparse("refs/heads/master" ).get_id()  ;
+                       //var master_oid =  this.repo.revparse("refs/heads/master" ).get_id()  ;
+                       var master_oid =  this.repo.revparse("HEAD" ).get_id()  ;
 
                        var master_commit  = this.repo.lookup_commit(master_oid);;
                        var head_commit = this.repo.lookup_commit(head_oid);
@@ -208,49 +210,35 @@ namespace  GitLive {
                        
                        var mo = new Ggit.MergeOptions();
                        var co = new Ggit.CheckoutOptions();
-                       var commits =   new Ggit.Commit[] { master_commit };
+                       var the_ref = this.repo.lookup_reference_dwim("refs/heads/master");
+
+                   var ac = new Ggit.AnnotatedCommit.from_ref(this.repo, the_ref);
+                       
+                       var commits =   new Ggit.AnnotatedCommit[] { ac };
                        
                        this.repo.merge(commits, mo, co);
-                       /*
-                       if (ix.has_conflicts()) {
-                               GLib.debug("merge has conflicts");
-                               return;
-                       }
                        
                        var cfg = this.repo.get_config().snapshot();
-                       var sig = new Ggit.Signature.now(
+                       
+                   var sig = new Ggit.Signature.now(
                                        cfg.get_string("user.name"),
                                        cfg.get_string("user.email")
                        );
+                       var new_head = this.repo.get_head();
+                       var oid = new_head.get_target();
 
-                       var parents =   new Ggit.OId[] { anc_commit.get_id() };
-                       
-                       var treeoid = ix.write_tree_to(this.repo);
+                       var ix = this.repo.get_index();
  
-                       this.repo.create_commit_from_ids("HEAD", 
-                                sig, sig, null, "Test Merge", treeoid, parents);
-                       
-                       /*
-                       var master_tree = master_commit.get_tree();
-                       var head_tree = head_commit.get_tree();
-                       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);
-                       
-                       // might be conflicts..
-                       this.repo.checkout_index(ix, new Ggit.CheckoutOptions());
-                        var treeoid = ix.write_tree();
-                        
-                         
-                       var parents =   new Ggit.Commit[] { master_commit };
-
+                       ix.write();
+                       var treeoid = ix.write_tree();
 
                        var new_tree = this.repo.lookup(treeoid,typeof (Ggit.Tree))  as   Ggit.Tree;
                        
-                               );
-                       this.repo.create_commit("HEAD", sig, sig, null, "Test Merge", new_tree, parents);
-               */
-               
+                       var parent = new_head.lookup() as Ggit.Commit;
+                       Ggit.Commit[] parents =  new Ggit.Commit[] { parent };
+                       
+                       this.repo.create_commit("refs/heads/" + this.head.get_name(), sig, sig, null, "Test Merge", new_tree, parents);
+        
                }