Git.vala

[gitlive] / Git.vala

diff --git a/Git.vala b/Git.vala
index 9ad50b0..1124fda 100644 (file)
--- a/Git.vala
+++ b/Git.vala
@@ -91,17 +91,17 @@ namespace  GitLive {
                        
                
                }
-               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) {
-                               GLib.debug("test:%s", br.get_upstream().get_shorthand());
-                               if ("ref/heads/" + br.get_upstream().get_shorthand() == remote_name) {
+                               GLib.debug("test:%s=%s", "refs/remotes/" +  br.get_upstream().get_shorthand() , remote_branch_name);
+                               if ("refs/remotes/" +  br.get_upstream().get_shorthand() == remote_branch_name) {
                                        return br;
                                }
                                
                        }
-                       GLib.debug("missing %s", remote_name);                  
+                       //GLib.debug("missing %s", remote_branch_name);                 
                        return null;
                
                }
@@ -128,7 +128,7 @@ namespace  GitLive {
                                
                                var heads = r.list();
                                foreach(var rh in heads) {
-                                       var br = this.getBranch(n, rh.get_name());
+                                       var br = this.getBranch(n, rh.get_shorthand());
                                
                                        GLib.debug("got heads: name=%s   rev=%s  localrev=%s",
                                                rh.get_name(),