From: Alan Knowles <alan@roojs.com>
Date: Fri, 15 Mar 2019 05:19:04 +0000 (+0800)
Subject: Git.vala
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=1034d5bb5c72fa4da9c23e9a2e9151a2132b0ee5

Git.vala
---

diff --git a/Git.vala b/Git.vala
index e4148794..8a53c361 100644
--- a/Git.vala
+++ b/Git.vala
@@ -126,6 +126,8 @@ namespace  GitLive {
 		{
 			this.loadLocalBranches();
 			
+			
+			
 			var oid =  this.repo.revparse(this.head.get_name() ).get_id()  ;
 			var moid =  this.repo.revparse("refs/heads/master" ).get_id()  ;
 			
@@ -190,6 +192,7 @@ namespace  GitLive {
 		public void mergeMasterIntoHead()
 		{
 			// assumes head is not master...
+			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()  ;