From dcce2976b5c6e2b2e21eaffc4d23e0e50ff4a3af Mon Sep 17 00:00:00 2001 From: Maxwell Salzberg Date: Fri, 20 Jan 2012 16:37:32 -0800 Subject: [PATCH] reset soft so you dont lose your custom homepage when you deploy --- lib/tasks/after_deploy.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/after_deploy.rake b/lib/tasks/after_deploy.rake index 0f76cb137..6b01af915 100644 --- a/lib/tasks/after_deploy.rake +++ b/lib/tasks/after_deploy.rake @@ -5,7 +5,7 @@ task :after_deploy => :environment do if File.exist?(File.join(Rails.root, "app", "views", "home", "_show.html.haml")) && system("git log | head -5 | grep 'custom\ landing\ page'") puts "-----> resetting HEAD before custom landing page commit" - system("git reset --hard HEAD^") ? true : fail + system("git reset HEAD^") ? true : fail system("git stash pop") unless @did_not_stash puts "-----> done"