From a9e91ff1f8b3ae9cfacefe9a5ce7ee6d1c596df7 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 13 Mar 2019 15:15:04 +0800 Subject: [PATCH] Git.vala --- Git.vala | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Git.vala b/Git.vala index cc455751..d8ef3c05 100644 --- a/Git.vala +++ b/Git.vala @@ -93,10 +93,13 @@ namespace GitLive { } Ggit.Branch? getBranch(string remote_name, string remote_branch_name) { - GLib.debug("lookup %s:%s", remote_name, remote_branch_name); + + var target = remote_branch_name.replace("refs/heads/", remote_name+"/"); + + foreach(var br in this.branches) { - 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) { + GLib.debug("test:%s=%s", br.get_upstream().get_shorthand() , target); + if ( br.get_upstream().get_shorthand() == remote_branch_name) { return br; } -- 2.39.2