Add -x option to 'clean' to remove ignored files

cwalsh · cwalsh · commit dfaa57bdd13e · 2014-01-06T17:01:44.000+11:00
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -428,7 +428,8 @@ def clean(opts = {})
       arr_opts = [] 
       arr_opts << '--force' if opts[:force]
       arr_opts << '-d' if opts[:d]
-      
+      arr_opts << '-x' if opts[:x]
+
       command('clean', arr_opts)
     end
     
diff --git a/tests/units/test_index_ops.rb b/tests/units/test_index_ops.rb
@@ -43,6 +43,9 @@ def test_clean
       g = Git.clone(@wbare, 'clean_me')
       Dir.chdir('clean_me') do
         new_file('test-file', 'blahblahbal')
+        new_file('ignored_file', 'ignored file contents')
+        new_file('.gitignore', 'ignored_file')
+
         g.add
         g.commit("first commit")
 
@@ -55,18 +58,24 @@ def test_clean
 
         assert(File.exists?('file-to-clean'))
         assert(File.exists?('dir_to_clean'))
-        
+        assert(File.exists?('ignored_file'))
+
         g.clean(:force => true)
         
         assert(!File.exists?('file-to-clean'))
         assert(File.exists?('dir_to_clean'))
-        
+        assert(File.exists?('ignored_file'))
+
         new_file('file-to-clean', 'blablahbla')
         
         g.clean(:force => true, :d => true)
 
         assert(!File.exists?('file-to-clean'))
         assert(!File.exists?('dir_to_clean'))
+        assert(File.exists?('ignored_file'))
+
+        g.clean(:force => true, :x => true)
+        assert(!File.exists?('ignored_file'))
       end
     end
   end
