GitRepo.vala
authorAlan Knowles <alan@roojs.com>
Fri, 28 Dec 2018 07:11:19 +0000 (15:11 +0800)
committerAlan Knowles <alan@roojs.com>
Fri, 28 Dec 2018 07:11:19 +0000 (15:11 +0800)
GitRepo.vala

index bdfd2fa..522e58a 100644 (file)
@@ -601,19 +601,20 @@ public class GitRepo : Object
         try {                                  
                        var lines = this.git({"log", "master...",  "--pretty=format:\"%H %P\"" }).split("\n");;
                        var head = this.git({"log", "-1",  "--pretty=format:\"%H %P\"" });
         try {                                  
                        var lines = this.git({"log", "master...",  "--pretty=format:\"%H %P\"" }).split("\n");;
                        var head = this.git({"log", "-1",  "--pretty=format:\"%H %P\"" });
+                       start = head.split(" ")[0];
                        var start = "";
                        for (var i = 0; i < lines.length; i++) {
                                var cols = lines[i].split(" ");
                                if (cols.length > 2) {
                        var start = "";
                        for (var i = 0; i < lines.length; i++) {
                                var cols = lines[i].split(" ");
                                if (cols.length > 2) {
-                                       start = cols[0];
+                                       end = cols[0];
                                        break;
                                }
                        }
                                        break;
                                }
                        }
-                       if (start == "") {
+                       if (end == "") {
                                var last = lines[lines.length-1];
                                var last = lines[lines.length-1];
-                               start = head.split(" ")[0];
+                               var end = last.split(" ")[1];                           
                        }
                        }
-                       var end = last.split(" ")[1];
+
                        return this.git({ "diff" , start+".."+end, "--no-color" });
                }  catch(Error ee) {
                        GitMonitor.gitmonitor.pauseError(ee.message);
                        return this.git({ "diff" , start+".."+end, "--no-color" });
                }  catch(Error ee) {
                        GitMonitor.gitmonitor.pauseError(ee.message);