lib/rim/sync_module_helper.rb in esr-rim-1.3.6 vs lib/rim/sync_module_helper.rb in esr-rim-1.3.7

@@ -59,18 +59,17 @@
     end
 
     def needs_commit?(session)
       # do we need to commit something?
       stat = session.status(@module_info.local_path)
-      ignored = stat.lines.select{ |l| l.ignored? }
+      # no files should be ignored due to --force option. Anyway we will check for ignored files
+      ignored = []
+      session.execute("git add --all --force #{@module_info.local_path}") do |out, e|
+        ignored = parse_ignored_files(session, out, e)
+      end
       if ignored.empty?
-        session.execute("git add --all #{@module_info.local_path}") do |out, e|
-          ignored = parse_ignored_files(session, out, e)
-        end
-        if ignored.empty?
-          stat = session.status(@module_info.local_path)
-          ignored = stat.lines.select{ |l| l.ignored? }
-        end
+        stat = session.status(@module_info.local_path)
+        ignored = stat.lines.select{ |l| l.ignored? }
       end
       if !ignored.empty?
         messages = ["Sync failed due to files/dirs of #{@module_info.local_path} which are ignored by workspace's .gitignore:"]
         ignored.each do |l|
           messages.push(l.file)