@@ -55,11 +55,11 @@ module Piston end def after_remember(path) - Dir.chdir(self.path) { git(:add, "-f", path.relative_path_from(self.path)) } + Dir.chdir(self.path) { git(:add, "--force", path.relative_path_from(self.path)) } end def finalize - Dir.chdir(path) { git(:add, "-f", ".") } + Dir.chdir(path) { git(:add, "--force", ".") } end def add(added) lib/piston/git/working_copy.rb @@ -9,7 +9,7 @@ class Piston::Git::TestGitWorkingCopyFinalization < Piston::TestCase def test_finalize_adds_path_to_git Dir.expects(:chdir).with(@wcdir).yields - @wc.expects(:git).with(:add, ".") + @wc.expects(:git).with(:add, "--force", ".") @wc.finalize end end test/unit/git/working_copy/test_finalization.rb 40c0bc4e3c63aa398d319ec08846538705950e3d François Beausoleil francois@teksol.info http://github.com/francois/piston/commit/731946cd69393e3cc616f75504f79ba65e95579e 731946cd69393e3cc616f75504f79ba65e95579e 2009-08-01T10:08:15-07:00 2009-08-01T10:08:15-07:00 Correctly expect --force for 'git add' 7702d0e5af90361ff41a62184dd4bf4ff0223ce7 François Beausoleil francois@teksol.info