aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-10-30 14:59:22 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2013-10-30 14:59:22 -0700
commitfe7ec5d52f5bd1a145ae22e850a366f57d2dd7d4 (patch)
tree362712c98b5bf7875ab81c1dbe73b9d59a447de4
parenta092ea14dcfaebc4bcb0707e60cf10eb53d81f4b (diff)
downloadrails-fe7ec5d52f5bd1a145ae22e850a366f57d2dd7d4.tar.gz
rails-fe7ec5d52f5bd1a145ae22e850a366f57d2dd7d4.tar.bz2
rails-fe7ec5d52f5bd1a145ae22e850a366f57d2dd7d4.zip
stop mutating ARGV
-rw-r--r--railties/lib/rails/commands/application.rb4
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/commands/application.rb b/railties/lib/rails/commands/application.rb
index 04a4f292a0..c998e6b6a8 100644
--- a/railties/lib/rails/commands/application.rb
+++ b/railties/lib/rails/commands/application.rb
@@ -13,5 +13,5 @@ module Rails
end
end
-Rails::Generators::ARGVScrubber.new(ARGV).prepare!
-Rails::Generators::AppGenerator.start
+args = Rails::Generators::ARGVScrubber.new(ARGV).prepare!
+Rails::Generators::AppGenerator.start args
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index 1a75ebacc1..159fa6b761 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -315,7 +315,7 @@ module Rails
attr_reader :argv
def initialize(argv = ARGV)
- @argv = argv
+ @argv = argv.dup
end
def prepare!