Fixed git.blob.Blob.blame function which would return the text-per-commit as individual characters

2 files changed, 9 insertions, 1 deletions

diff --git a/lib/git/blob.py b/lib/git/blob.py
index 82f92ce3..a15c5466 100644
--- a/lib/git/blob.py
+++ b/lib/git/blob.py
@@ -135,7 +135,7 @@ class Blob(object):
                     m = re.search(r'^\t(.*)$', line)
                     text,  = m.groups()
                     blames[-1][0] = c
-                    blames[-1][1] += text
+                    blames[-1][1].append( text )
                     info = None
 
         return blames
diff --git a/test/git/test_blob.py b/test/git/test_blob.py
index 8f83f391..5bd74ff7 100644
--- a/test/git/test_blob.py
+++ b/test/git/test_blob.py
@@ -69,6 +69,7 @@ class TestBlob(object):
         git.return_value = fixture('blame')
         b = Blob.blame(self.repo, 'master', 'lib/git.py')
         assert_equal(13, len(b))
+        assert_equal( 2, len(b[0]) )
         # assert_equal(25, reduce(lambda acc, x: acc + len(x[-1]), b))
         assert_equal(hash(b[0][0]), hash(b[9][0]))
         c = b[0][0]
@@ -83,6 +84,13 @@ class TestBlob(object):
         assert_equal('tom@mojombo.com', c.committer.email)
         assert_equal(time.gmtime(1191997100), c.committed_date)
         assert_equal('initial grit setup', c.message)
+        
+        # test the 'lines per commit' entries
+        tlist = b[0][1]
+        assert_true( tlist )
+        assert_true( isinstance( tlist[0], basestring ) )
+        assert_true( len( tlist ) < sum( len(t) for t in tlist ) )				 # test for single-char bug
+        
   
     def test_should_return_appropriate_representation(self):
         blob = Blob(self.repo, **{'id': 'abc'})