0
@@ -42,9 +42,7 @@ class RemoteController < ApplicationController
0
         remote_branches = git.branch.list_names(:remote)
0
         # by default, select a branch with the same name first
0
         remote_branches = (remote_branches.grep(/(\/|^)#{branch.name}$/) + remote_branches).uniq
0
-        # hack - make it always prompt (we don't want to just jump the gun and merge the only branch if only one is available... give them the choice)
0
-        remote_branches << ""
0
-        remote_branch_name = TextMate::UI.request_item(:title => "Branch to merge from?", :prompt => "Merge which branch to '#{branch.name}'?", :items => remote_branches)
0
+        remote_branch_name = TextMate::UI.request_item(:title => "Branch to merge from?", :prompt => "Merge which branch to '#{branch.name}'?", :items => remote_branches, :force_pick => true)
0
         if remote_branch_name.nil? || remote_branch_name.empty?
0
           puts "Aborted"
0
           return
0
@@ -134,7 +132,7 @@ class RemoteController < ApplicationController
0
     end
0
     
0
     def for_each_selected_remote(options, &block)
0
-      options = {:title => "Select remote", :prompt => "Select a remote..."}.merge(options)
0
+      options = {:title => "Select remote", :prompt => "Select a remote...", :force_pick => true}.merge(options)
0
       default = options.delete(:default)
0
       sources = options[:items]
0
       if default
0
@@ -142,7 +140,6 @@ class RemoteController < ApplicationController
0
         sources.uniq!
0
       end
0
       
0
-      sources << ALL_REMOTES if sources.length > 1
0
       TextMate::UI.request_item(options) do |selections|
0
         ((selections == ALL_REMOTES) ? (sources-[ALL_REMOTES]) : [selections]).each do |selection|
0
           yield selection