From 76d31f3110a7fdbdeda33e04079d3e9e9d3bff6d Mon Sep 17 00:00:00 2001
From: Tray Torrance <devwork@warrentorrance.com>
Date: Mon, 14 Nov 2011 11:01:39 -0800
Subject: [PATCH] Hooks current_git_branch to before deploy:update

Also refactors after deploy:symlink hooks
---
 config/deploy.rb | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/config/deploy.rb b/config/deploy.rb
index d1ad6a854..cdb1f8aac 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -32,9 +32,6 @@ def current_git_branch
   branch
 end
 
-# Set the deploy branch to the current branch
-set :branch, current_git_branch
-
 namespace :deploy do
   task :symlink_config_files do
     run "ln -s -f #{shared_path}/config/database.yml #{current_path}/config/database.yml"
@@ -88,5 +85,14 @@ namespace :deploy do
   end
 end
 
-after "deploy:symlink", "deploy:symlink_config_files", "deploy:symlink_cookie_secret", "deploy:bundle_static_assets", 'deploy:copy_resque_assets'
+before 'deploy:update' do
+  set :branch, current_git_branch
+end
+
+after 'deploy:symlink' do
+  deploy.symlink_config_files
+  deploy.symlink_cookie_secret
+  deploy.bundle_static_assets
+  deploy.copy_resque_assets
+end