X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=GitRepo.vala;h=8d59f7af86bdcdcebf5d57bb9393877568fbe36b;hb=1c3d87de49e514421b3a08bfc3d6d4a822517f98;hp=08917693cde061a269eb8d862d369e41d9a2f5e3;hpb=dc24fce063ca75ff820e13353ff9b9b7c5bba546;p=gitlive diff --git a/GitRepo.vala b/GitRepo.vala index 08917693..8d59f7af 100644 --- a/GitRepo.vala +++ b/GitRepo.vala @@ -335,13 +335,13 @@ public class GitRepo : Object this.git_status = r; this.has_local_changes = r.length > 0; - var rs = this.git({ "status" , "-sb" }); - + //var rs = this.git({ "status" , "-sb" }); + var cb = this.getCurrentBranch(); - this.ahead_or_behind = rs.contains("[ahead") ? "A" : (rs.contains("[behind") ? "B" : ""); + this.ahead_or_behind = cb.ahead > 0 ? "A" : (cb.behind > 0 ? "B" : ""); - this.git_diff = this.git({ "diff" , "HEAD", "--no-color" }); + this.git_diff = this.diffWorking(); }