projects
/
gitlive
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disable comment on get_upstream
[gitlive]
/
GitBranch.vala
diff --git
a/GitBranch.vala
b/GitBranch.vala
index
a2ec315
..
1f309f4
100644
(file)
--- a/
GitBranch.vala
+++ b/
GitBranch.vala
@@
-90,12
+90,15
@@
public class GitBranch : Object
remotes.set(rn.substring(11), rh.get_oid());
remotes_used.set(rn.substring(11), false);
remotes.set(rn.substring(11), rh.get_oid());
remotes_used.set(rn.substring(11), false);
- }
+ }
+
+
} catch (Error e) {
GLib.debug("Failed to fetch remotes continuing on ");
}
} catch (Error e) {
GLib.debug("Failed to fetch remotes continuing on ");
}
+ rem.disconnect();
+
-
var r = repo.repo.enumerate_branches(Ggit.BranchType.LOCAL);
while (r.next()) {
var r = repo.repo.enumerate_branches(Ggit.BranchType.LOCAL);
while (r.next()) {
@@
-110,13
+113,17
@@
public class GitBranch : Object
br.active = gbr.is_head();
br.name = gbr.get_name();
br.lastrev = gbr.get_target().to_string();
br.active = gbr.is_head();
br.name = gbr.get_name();
br.lastrev = gbr.get_target().to_string();
- string rname ;
+ string rname ="";
+ /*
+
+ THIS IS DISABLED, and get_upstream has a major memor leak.
try {
rname = gbr.get_upstream() != null ? gbr.get_upstream().get_name() : "";
} catch(Error e) {
GLib.debug("Skip branch = got error");
continue;
}
try {
rname = gbr.get_upstream() != null ? gbr.get_upstream().get_name() : "";
} catch(Error e) {
GLib.debug("Skip branch = got error");
continue;
}
+ */
repo.branches.set(gbr.get_name(), br);
if (rname.has_prefix("refs/remotes/origin/")) {
rname = rname.substring(20);
repo.branches.set(gbr.get_name(), br);
if (rname.has_prefix("refs/remotes/origin/")) {
rname = rname.substring(20);