0
@@ -3,19 +3,17 @@ require LIB_ROOT + '/ui.rb'
0
 class BranchController < ApplicationController
0
   layout "application", :except => [:create, :delete]
0
   def switch
0
-    locals = git.branch.list_names(:local)
0
-    remotes = git.branch.list_names(:remote)
0
-    current = git.branch.current_name
0
-    items = ([current] + locals + remotes).compact.uniq
0
+    current_name = git.branch.current_name
0
+    items = ([current_name] + git.branch.names(:local) + git.branch.names(:remote)).compact.uniq
0
     if items.length == 0
0
-      puts "Current branch is '#{current || '(no branch)'}'. There are no other branches."
0
+      puts "Current branch is '#{current_name || '(no branch)'}'. There are no other branches."
0
     else
0
-      target_branch = TextMate::UI.request_item(:title => "Switch to Branch", :prompt => "Current branch is '#{current || '(no branch)'}'.\nSelect a new branch to switch to:", :items => items) 
0
+      target_branch = TextMate::UI.request_item(:title => "Switch to Branch", :prompt => "Current branch is '#{current_name || '(no branch)'}'.\nSelect a new branch to switch to:", :items => items) 
0
       if target_branch.blank?
0
         exit_discard
0
       end
0
       
0
-      if locals.include?(target_branch)
0
+      if git.branch.names(:local).include?(target_branch)
0
         switch_local(target_branch)
0
       else
0
         switch_remote(target_branch)