projects
/
gitlive
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f5e0961
)
GitRepo.vala
author
Alan Knowles
<alan@roojs.com>
Wed, 27 Mar 2019 03:58:02 +0000
(11:58 +0800)
committer
Alan Knowles
<alan@roojs.com>
Wed, 27 Mar 2019 03:58:02 +0000
(11:58 +0800)
GitRepo.vala
patch
|
blob
|
history
diff --git
a/GitRepo.vala
b/GitRepo.vala
index
1075fa2
..
2de3ab9
100644
(file)
--- a/
GitRepo.vala
+++ b/
GitRepo.vala
@@
-335,10
+335,10
@@
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.benind > 0
? "B" : "");
this.git_diff = this.diffWorking();