Merge pull request #1609 from alindeman/patch-1

Fixes load path issues with ruby-based git credential helpers
This commit is contained in:
Parker Moore 2014-07-19 19:35:13 -04:00
commit c977b91e40
1 changed files with 2 additions and 2 deletions

View File

@ -253,7 +253,7 @@ multitask :push do
puts "## Deploying branch to Github Pages " puts "## Deploying branch to Github Pages "
puts "## Pulling any updates from Github Pages " puts "## Pulling any updates from Github Pages "
cd "#{deploy_dir}" do cd "#{deploy_dir}" do
system "git pull" Bundler.with_clean_env { system "git pull" }
end end
(Dir["#{deploy_dir}/*"]).each { |f| rm_rf(f) } (Dir["#{deploy_dir}/*"]).each { |f| rm_rf(f) }
Rake::Task[:copydot].invoke(public_dir, deploy_dir) Rake::Task[:copydot].invoke(public_dir, deploy_dir)
@ -265,7 +265,7 @@ multitask :push do
puts "\n## Committing: #{message}" puts "\n## Committing: #{message}"
system "git commit -m \"#{message}\"" system "git commit -m \"#{message}\""
puts "\n## Pushing generated #{deploy_dir} website" puts "\n## Pushing generated #{deploy_dir} website"
system "git push origin #{deploy_branch}" Bundler.with_clean_env { system "git push origin #{deploy_branch}" }
puts "\n## Github Pages deploy complete" puts "\n## Github Pages deploy complete"
end end
end end