From eefa59020450c8db84980c518f09f1b3ffefe714 Mon Sep 17 00:00:00 2001 From: Brian Miller Date: Thu, 9 Aug 2012 16:13:08 -0700 Subject: [PATCH 1/3] Local branches with / in the name should not be mistaken for remote branches --- lib/git/branch.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/git/branch.rb b/lib/git/branch.rb index 15101b33..237ffaf1 100644 --- a/lib/git/branch.rb +++ b/lib/git/branch.rb @@ -11,11 +11,11 @@ def initialize(base, name) @stashes = nil parts = name.split('/') - if parts[1] + if parts[1] && parts[0] == "remote" @remote = Git::Remote.new(@base, parts[0]) @name = parts[1] else - @name = parts[0] + @name = name end end From b556c1f38f7509591778ba84527572fbf7201da8 Mon Sep 17 00:00:00 2001 From: Brian Miller Date: Thu, 9 Aug 2012 16:13:08 -0700 Subject: [PATCH 2/3] Local branches with / in the name should not be mistaken for remote branches --- lib/git/branch.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/git/branch.rb b/lib/git/branch.rb index 15101b33..237ffaf1 100644 --- a/lib/git/branch.rb +++ b/lib/git/branch.rb @@ -11,11 +11,11 @@ def initialize(base, name) @stashes = nil parts = name.split('/') - if parts[1] + if parts[1] && parts[0] == "remote" @remote = Git::Remote.new(@base, parts[0]) @name = parts[1] else - @name = parts[0] + @name = name end end From a2eaf7bdd4181cb3c30b2282f683fc51bf9f6c0b Mon Sep 17 00:00:00 2001 From: Brian Miller Date: Thu, 9 Aug 2012 16:24:33 -0700 Subject: [PATCH 3/3] Switched remote to remotes --- lib/git/branch.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/git/branch.rb b/lib/git/branch.rb index 237ffaf1..0d02ed5c 100644 --- a/lib/git/branch.rb +++ b/lib/git/branch.rb @@ -11,7 +11,7 @@ def initialize(base, name) @stashes = nil parts = name.split('/') - if parts[1] && parts[0] == "remote" + if parts[1] && parts[0] == "remotes" @remote = Git::Remote.new(@base, parts[0]) @name = parts[1] else