diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/rails_generator/commands.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 956814f17f..8bf673b027 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Generator: use destination path for diff tempfiles. #7015 [alfeld] + * Fixed that webrick would strip leading newlines and hang connection #4156 [psross] * Ensure plugins are in the Dependencies.load_once_paths collection by default. [Rick] diff --git a/railties/lib/rails_generator/commands.rb b/railties/lib/rails_generator/commands.rb index 783d9aeb3a..d9c471a915 100644 --- a/railties/lib/rails_generator/commands.rb +++ b/railties/lib/rails_generator/commands.rb @@ -96,7 +96,7 @@ module Rails $stdout.print "overwrite #{destination}? [Ynaqd] " case $stdin.gets when /d/i - Tempfile.open(File.basename(destination), File.dirname(destination)) do |temp| + 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}` |