projects
/
gitlive
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
baa53e9
)
GitBranch.vala
author
Alan Knowles
<alan@roojs.com>
Wed, 20 Mar 2019 07:21:45 +0000
(15:21 +0800)
committer
Alan Knowles
<alan@roojs.com>
Wed, 20 Mar 2019 07:21:45 +0000
(15:21 +0800)
GitBranch.vala
patch
|
blob
|
history
diff --git
a/GitBranch.vala
b/GitBranch.vala
index
6291e8d
..
5776ab6
100644
(file)
--- a/
GitBranch.vala
+++ b/
GitBranch.vala
@@
-92,8
+92,15
@@
public class GitBranch : Object
br.active = gbr.is_head();
br.name = gbr.get_name();
br.lastrev = gbr.get_target().to_string();
- var rname = br.get_upstream().get_name();
-
+ var rname = br.get_upstream() ? br.get_upstream().get_name() : "";
+ if (rname.has_prefix("refs/remotes/origin/")) {
+ rname = rname.substring(20);
+ if (remotes.has_key(rname)) {
+ br.remote = rname;
+ br.remoterev = remotes.get(rname);
+ }
+ // age?
+ }
}