From cfedbd9f44fcc380f41d5fd40652172e3ec67d65 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 28 Dec 2018 15:10:51 +0800 Subject: [PATCH] GitRepo.vala --- GitRepo.vala | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/GitRepo.vala b/GitRepo.vala index 801fe8df..bdfd2faa 100644 --- a/GitRepo.vala +++ b/GitRepo.vala @@ -601,8 +601,18 @@ 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\"" }); - var last = lines[lines.length-1]; - var start = head.split(" ")[0]; + var start = ""; + for (var i = 0; i < lines.length; i++) { + var cols = lines[i].split(" "); + if (cols.length > 2) { + start = cols[0]; + break; + } + } + if (start == "") { + var last = lines[lines.length-1]; + start = head.split(" ")[0]; + } var end = last.split(" ")[1]; return this.git({ "diff" , start+".."+end, "--no-color" }); } catch(Error ee) { -- 2.39.2