diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index bdeebbb8b5baa28382dfa7fa12a2ae1035c49660..fb2af96b45d6e7763679d72877b6f92dedeba398 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 @@ def gitignore 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 35f7d519d8506d026e81ec83fb0ee7d88bad7a29..ee996dc9d6798c34b14730345969f9ec86b07a0d 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -592,6 +592,7 @@ def test_no_active_record_or_tests_if_skips_given 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