Preventing Git::Diff from parsing files content as diff metadata

robertodecurnex · othatbrian · commit e50e96968b34 · 2014-12-07T19:06:55.000-06:00
fix #196
diff --git a/lib/git/diff.rb b/lib/git/diff.rb
@@ -116,20 +116,25 @@ def cache_stats
       
       # break up @diff_full
       def process_full_diff
+        defaults = {
+          :mode => '',
+          :src => '',
+          :dst => '',
+          :type => 'modified'
+        }
         final = {}
         current_file = nil
         @full_diff.split("\n").each do |line|
-          if m = /diff --git a\/(.*?) b\/(.*?)/.match(line)
+          if m = /^diff --git a\/(.*?) b\/(.*?)/.match(line)
             current_file = m[1]
-            final[current_file] = {:patch => line, :path => current_file, 
-                                    :mode => '', :src => '', :dst => '', :type => 'modified'}
+            final[current_file] = defaults.merge({:patch => line, :path => current_file})
           else
-            if m = /index (.......)\.\.(.......)( ......)*/.match(line)
+            if m = /^index (.......)\.\.(.......)( ......)*/.match(line)
               final[current_file][:src] = m[1]
               final[current_file][:dst] = m[2]
               final[current_file][:mode] = m[3].strip if m[3]
             end
-            if m = /(.*?) file mode (......)/.match(line)
+           if m = /^([[:alpha:]]*?) file mode (......)/.match(line)
               final[current_file][:type] = m[1]
               final[current_file][:mode] = m[2]
             end
