aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2012-06-11 12:37:05 -0700
committerJosé Valim <jose.valim@plataformatec.com.br>2012-06-11 12:37:05 -0700
commitc53ff3317de5506943d3548ca6fb475bebe79aac (patch)
tree830c4ca47fb3326d94cf4575de452e9b3e1b5d94 /railties/lib
parent0d1f98ce65a0c70413546ccb3c36a9b843debcf0 (diff)
parent2d3e488bb307a0149268006f274d2876ce883ad2 (diff)
downloadrails-c53ff3317de5506943d3548ca6fb475bebe79aac.tar.gz
rails-c53ff3317de5506943d3548ca6fb475bebe79aac.tar.bz2
rails-c53ff3317de5506943d3548ca6fb475bebe79aac.zip
Merge pull request #6708 from amatsuda/ignore_git_ignored_files_in_rake_test_uncommitted
ignore .gitignore'd files in rake test:uncomitted
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/test_unit/testing.rake2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 55bebb549b..0de4afe905 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -87,7 +87,7 @@ namespace :test do
if File.directory?(".svn")
changed_since_checkin = silence_stderr { `svn status` }.split.map { |path| path.chomp[7 .. -1] }
elsif File.directory?(".git")
- changed_since_checkin = silence_stderr { `git ls-files --modified --others` }.split.map { |path| path.chomp }
+ changed_since_checkin = silence_stderr { `git ls-files --modified --others --exclude-standard` }.split.map { |path| path.chomp }
else
abort "Not a Subversion or Git checkout."
end