X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Git.vala;h=620700863ccf73f5affbc5042dfabfd4dd177037;hb=c02fc4d9e15adb3377948574522892233feab419;hp=b4cc84cda0e7b05e390db2a1fa8c4a78ba269430;hpb=a4ac2d6066f79b078520ea94db59c84ae9c48293;p=gitlive

diff --git a/Git.vala b/Git.vala
index b4cc84cd..62070086 100644
--- 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);
 	 
-		
 		}