}
- Ggit.Branch? getBranch(string remote_name)
+ Ggit.Branch? getBranch(string remote_name, string remote_branch_name)
{
- GLib.debug("lookup %s", remote_name);
+ GLib.debug("lookup %s:%s", remote_name, remote_branch_name);
foreach(var br in this.branches) {
- if (br.get_upstream().get_short_name() == remote_name) {
+ GLib.debug("test:%s", br.get_upstream().get_shorthand());
+ if ("ref/heads/" + remote_name + br.get_upstream().get_shorthand() == remote_branch_name) {
return br;
}
var heads = r.list();
foreach(var rh in heads) {
- var br = this.getBranch(rh.get_name());
+ var br = this.getBranch(n, rh.get_name());
GLib.debug("got heads: name=%s rev=%s localrev=%s",
rh.get_name(),