Status no longer includes ignored files.

nicodeceulaer · Mar 12, 2009 · 96bf1ac · 96bf1ac
1 parent 076df64
commit 96bf1ac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -304,6 +304,11 @@ def ls_files
     end
 
 
+    def ignored_files
+      command_lines('ls-files', ['--others', '-i', '--exclude-standard'])
+    end
+
+
     def config_remote(name)
       hsh = {}
       config_list.each do |key, value|

diff --git a/lib/git/status.rb b/lib/git/status.rb
@@ -81,11 +81,12 @@ def blob(type = :index)
 
       def construct_status
         @files = @base.lib.ls_files
+        ignore = @base.lib.ignored_files
 
         # find untracked in working dir
         Dir.chdir(@base.dir.path) do
           Dir.glob('**/*') do |file|
-            @files[file] = {:path => file, :untracked => true} unless @files[file] || File.directory?(file)
+            @files[file] = {:path => file, :untracked => true} unless @files[file] || File.directory?(file) || ignore.include?(file)
           end
         end