diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2017-01-23 13:30:08 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-23 13:30:08 -0300 |
| commit | 1e2e2d2d50e3be152658b44086b62a929bfc734e (patch) | |
| tree | 896983011d092692874e746c71500753ef52877e | |
| parent | 2d61745af4c6f134d1ff4a07d3a702353cd06005 (diff) | |
| parent | 7fa5f38c8e930188e866943f6adeccd214808b2a (diff) | |
| download | rails-1e2e2d2d50e3be152658b44086b62a929bfc734e.tar.gz rails-1e2e2d2d50e3be152658b44086b62a929bfc734e.tar.bz2 rails-1e2e2d2d50e3be152658b44086b62a929bfc734e.zip | |
Merge pull request #27771 from y-yagi/do_not_run_git_init_when_specify_the_pretent_option
do not run `git init` when specify the `pretend` option
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 1 |
2 files changed, 2 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 diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 35f7d519d8..ee996dc9d6 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -592,6 +592,7 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_pretend_option output = run_generator [File.join(destination_root, "myapp"), "--pretend"] assert_no_match(/run bundle install/, output) + assert_no_match(/run git init/, output) end def test_application_name_with_spaces |