Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Ensure Rails::Generator quotes file names while generating diff. [#264

…state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
  • Loading branch information...
commit a81f16af31b28203a7c2c6cd89249a90487b7fe0 1 parent 474d425
Carl Porth badcarl authored lifo committed
Showing with 1 addition and 1 deletion.
  1. +1 −1  railties/lib/rails_generator/commands.rb
2  railties/lib/rails_generator/commands.rb
View
@@ -88,7 +88,7 @@ def force_file_collision?(destination, src, dst, file_options = {}, &block)
Tempfile.open(File.basename(destination), File.dirname(dst)) do |temp|
temp.write render_file(src, file_options, &block)
temp.rewind
- $stdout.puts `#{diff_cmd} #{dst} #{temp.path}`
+ $stdout.puts `#{diff_cmd} "#{dst}" "#{temp.path}"`
end
puts "retrying"
raise 'retry diff'
Please sign in to comment.
Something went wrong with that request. Please try again.