public
Description: The Git TextMate Bundle
Homepage: http://tim.theenchanter.com/
Clone URL: git://github.com/timcharper/git-tmbundle.git
force_pick when choosing a branch
timcharper (author)
Tue Apr 01 00:35:54 -0700 2008
commit  08cb4d7bdfcfeb7f1f7d9fd15799e59a5abd8352
tree    e95f489a6bb77d9aad8feda8560b1deb72e41bff
parent  a0fa883ed18c295418723609e7a771323f75e70e
...
8
9
10
11
 
12
13
14
...
8
9
10
 
11
12
13
14
0
@@ -8,7 +8,7 @@ class BranchController < ApplicationController
0
     if items.length == 0
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_name || '(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, :force_pick => true)
0
       if target_branch.blank?
0
         exit_discard
0
       end
...
47
48
49
50
 
51
52
53
...
47
48
49
 
50
51
52
53
0
@@ -47,7 +47,7 @@ describe BranchController do
0
   describe "when switching branches" do
0
     before(:each) do
0
       @set_branch_to_choose = lambda { |response|
0
- TextMate::UI.should_receive(:request_item).with({:prompt=>"Current branch is 'master'.\nSelect a new branch to switch to:", :items=>["master", "task", "origin/master", "origin/release", "origin/task"], :title=>"Switch to Branch"}).and_return(response)
0
+ TextMate::UI.should_receive(:request_item).with({:prompt=>"Current branch is 'master'.\nSelect a new branch to switch to:", :items=>["master", "task", "origin/master", "origin/release", "origin/task"], :title=>"Switch to Branch", :force_pick => true}).and_return(response)
0
       }
0
     end
0
     

Comments

    No one has commented yet.