Fixing how commit logs are parsed for commits including newlinesi

robertodecurnex · robertodecurnex · commit b4f6090a34d7 · 2014-01-27T17:41:19.000-03:00
closes ruby-git#125
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -96,8 +96,6 @@ def full_log_commits(opts={})
 
       process_commit_log_data(full_log)
     end
-
-
     
     def revparse(string)
       return string if string =~ /[A-Fa-f0-9]{40}/  # passing in a sha - just no-op it
@@ -153,44 +151,43 @@ def process_commit_data(data, sha = nil, indent = 4)
       return hsh
     end
     
-    def process_commit_log_data(data, sha = nil, indent = 4)
+    def process_commit_log_data(data)
       in_message = false
             
-      if sha
-        hsh = {'sha' => sha, 'message' => '', 'parent' => []}
-      else
-        hsh_array = []        
-      end
+      hsh_array = []       
+
+      hsh = nil
     
       data.each do |line|
         line = line.chomp
-        if line == ''
-          in_message = !in_message
-        elsif in_message
-          hsh['message'] << line[indent..-1] << "\n"
-        else
-          data = line.split
-          key = data.shift
-          value = data.join(' ')
-          if key == 'commit'
-            sha = value
+        
+        if line[0].nil?
+          in_message = !in_message 
+          next
+        end
+       
+        if in_message
+          hsh['message'] << "#{line[4..-1]}\n"
+          next
+        end
+
+        key, *value = line.split
+        value = value.join(' ')
+        
+        case key
+          when 'commit'
             hsh_array << hsh if hsh
-            hsh = {'sha' => sha, 'message' => '', 'parent' => []}
-          end
-          if key == 'parent'
-            hsh[key] << value
+            hsh = {'sha' => value, 'message' => '', 'parent' => []}
+          when 'parent'
+            hsh['parent'] << value
           else
             hsh[key] = value
-          end
         end
       end
       
-      if hsh_array
-        hsh_array << hsh if hsh
-        hsh_array
-      else
-        hsh
-      end
+      hsh_array << hsh if hsh
+        
+      return hsh_array
     end
     
     def object_contents(sha, &block)
@@ -748,6 +745,7 @@ def command(cmd, opts = [], chdir = true, redirect = '', &block)
       if chdir && (Dir.getwd != path)
         Dir.chdir(path) { out = run_command(git_cmd, &block) } 
       else
+
         out = run_command(git_cmd, &block)
       end
       
