0
@@ -67,7 +67,7 @@ class BranchController < ApplicationController
0
   def merge
0
     # prompt for which branch to merge from
0
     c_branch = git.branch.current_name
0
-    all_branches = git.branch.list_names - [c_branch]
0
+    all_branches = git.branch.list_names(:remote) - [c_branch]
0
     all_branches << "" # keep the dialog from auto-selecting if there's only one other branch
0
     merge_from_branch = TextMate::UI.request_item(:title => "Merge", :prompt => "Merge which branch into '#{c_branch}':", :items => all_branches)
0
 

0
@@ -32,7 +32,6 @@ class SCM::Git::Branch < SCM::Git::SubmoduleBase
0
     when :all then params << "-a"
0
     when :remote then params << "-r"
0
     end
0
-    
0
     result = base.command("branch", *params).split("\n").map { |e| { :name => e[2..-1], :default => e[0..1] == '* ' } }
0
     if options[:remote_name]
0
       r_prefix = remote_branch_prefix(options[:remote_name])
0
@@ -50,7 +49,7 @@ class SCM::Git::Branch < SCM::Git::SubmoduleBase
0
   end
0
   
0
   def current_name
0
-    current[:name]
0
+    current && current[:name]
0
   end
0
 
0
   def remote_branch_prefix(remote_name)