aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/rails/app/app_generator.rb
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-01-23 10:04:24 +0900
committeryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-01-23 10:07:15 +0900
commit7fa5f38c8e930188e866943f6adeccd214808b2a (patch)
tree896983011d092692874e746c71500753ef52877e /railties/lib/rails/generators/rails/app/app_generator.rb
parent2d61745af4c6f134d1ff4a07d3a702353cd06005 (diff)
downloadrails-7fa5f38c8e930188e866943f6adeccd214808b2a.tar.gz
rails-7fa5f38c8e930188e866943f6adeccd214808b2a.tar.bz2
rails-7fa5f38c8e930188e866943f6adeccd214808b2a.zip
do not run `git init` when specify the `pretend` option
When specifying the `pretend` option, expect that no processing will be done, so do not execute `git init` as well.
Diffstat (limited to 'railties/lib/rails/generators/rails/app/app_generator.rb')
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index bdeebbb8b5..fb2af96b45 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -54,7 +54,7 @@ module Rails
end
def version_control
- unless options[:skip_git]
+ if !options[:skip_git] && !options[:pretend]
run "git init"
end
end