lib/rim/sync_module_helper.rb in esr-rim-1.4.4 vs lib/rim/sync_module_helper.rb in esr-rim-1.4.7

- old
+ new

@@ -30,10 +30,10 @@ RIM::git_session(git_path) do |s| if !s.rev_sha1(@module_info.target_revision) raise RimException.new("Unknown target revision '#{@module_info.target_revision}' for module '#{@module_info.local_path}'.") end local_path = File.join(@dest_root, @module_info.local_path) - prepare_empty_folder(local_path, @module_info.ignores) + prepare_empty_folder(local_path, [*@module_info.ignores, ".git/**/*"]) temp_commit(d, "clear directory") if d.uncommited_changes? strip = "" if @module_info.subdir depth = Pathname(@module_info.subdir).each_filename.count() strip = "--strip-components=#{depth}"