Must reset the branch before checkout, in case it is dirty

mikeweaver · Dec 29, 2015 · cb847d7 · cb847d7
1 parent ac96d68
commit cb847d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/git/git.rb b/lib/git/git.rb
@@ -97,6 +97,7 @@ def push()
     end
 
     def checkout_branch(branch_name)
+      execute("reset --hard origin/#{branch_name}")
       execute("checkout #{branch_name}")
       execute("reset --hard origin/#{branch_name}")
     end

diff --git a/spec/lib/git/git_spec.rb b/spec/lib/git/git_spec.rb
@@ -76,7 +76,7 @@ def mock_execute(stdout_andstderr_str, status, execution_count=1)
     end
 
     it 'can checkout a branch' do
-      mock_execute('Success', 1, 2)
+      mock_execute('Success', 1, 3)
       @git.checkout_branch('branch_name')
     end