add enable_checkout attribute; add ability to override 'deploy' with checkout_branch name

1 files changed, 7 insertions, 4 deletions

diff --git a/lib/chef/provider/git.rb b/lib/chef/provider/git.rb
index b22004eda0..ac128b7d2f 100644
--- a/lib/chef/provider/git.rb
+++ b/lib/chef/provider/git.rb
@@ -151,10 +151,13 @@ class Chef
 
       def checkout
         sha_ref = target_revision
-        converge_by("checkout ref #{sha_ref} branch #{@new_resource.revision}") do
-          # checkout into a local branch rather than a detached HEAD
-          shell_out!("git checkout -b deploy #{sha_ref}", run_options(:cwd => @new_resource.destination))
-          Chef::Log.info "#{@new_resource} checked out branch: #{@new_resource.revision} reference: #{sha_ref}"
+
+        if @new_resource.enable_checkout
+          converge_by("checkout ref #{sha_ref} branch #{@new_resource.revision}") do
+            # checkout into a local branch rather than a detached HEAD
+            shell_out!("git checkout -b #{@new_resource.checkout_branch} #{sha_ref}", run_options(:cwd => @new_resource.destination))
+            Chef::Log.info "#{@new_resource} checked out branch: #{@new_resource.revision} onto: #{@new_resource.checkout_branch} reference: #{sha_ref}"
+          end
         end
       end