From: Alan Knowles <alan@roojs.com>
Date: Fri, 28 Dec 2018 06:43:27 +0000 (+0800)
Subject: Changed GitRepo.vala
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=c3c33cd41d988758382befe74986769da6e39c36

Changed GitRepo.vala
---

diff --git a/GitRepo.vala b/GitRepo.vala
index 91feb4c8..7cd755d1 100644
--- a/GitRepo.vala
+++ b/GitRepo.vala
@@ -565,6 +565,23 @@ public class GitRepo : Object
 	 		return true;
      
      }
+     
+     public string previewMerge()
+     {
+     	 try {					
+			var lines = this.git({"log", "master...",  "--pretty=format:\"%H %P\"" }).split("\n");;
+			var head = this.git({"log", "-1",  "--pretty=format:\"%H %P\"" });
+			var last = lines[lines.length-1];
+			var start = head.split(" ")[0];
+			var end = last.split(" ")[1];
+			return this.git({ "diff" , start+".."+end, "--no-color" });
+		}  catch(Error ee) {
+	 		GitMonitor.gitmonitor.pauseError(ee.message);
+	 		return "Error getting diff";     	
+ 		}
+ 	 
+     
+     }