Generator: use destination path for diff tempfiles. Closes #7015.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5914 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

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]

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}`