add stash to before/after deploy so you dont lose in progress h@x

diaspora · Jan 20, 2012 · f3120b3 · f3120b3
1 parent f0a698d
commit f3120b3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/lib/tasks/after_deploy.rake b/lib/tasks/after_deploy.rake
@@ -6,6 +6,7 @@ task :after_deploy => :environment do
     puts "-----> resetting HEAD before custom landing page commit"
 
     system("git reset --hard HEAD^") ? true : fail
+    system("git stash pop") ? true : fail
 
     puts "-----> done"
   end

diff --git a/lib/tasks/before_deploy.rake b/lib/tasks/before_deploy.rake
@@ -7,6 +7,10 @@ task :before_deploy => :environment do
 
     puts "-----> including custom landing page in a temp commit"
 
+
+    pp @app_settings
+
+    system("git stash") ? true : fail
     system("git add app/views/home/_show.html.haml -f") ? true : fail
     system("git commit -m 'adding custom landing page for heroku'") ? true : fail