summaryrefslogtreecommitdiff
path: root/git/repo/base.py
diff options
context:
space:
mode:
authorVincent Driessen <me@nvie.com>2016-05-24 19:28:44 +0200
committerVincent Driessen <me@nvie.com>2016-05-24 19:28:44 +0200
commit123302cee773bc2f222526e036a57ba71d8cafa9 (patch)
treecebdf30a296c72a2628f06ec8079cc4cf6c7f28a /git/repo/base.py
parent7228ca9bf651d9f06395419752139817511aabe1 (diff)
parent187fe114585be2d367a81997509b40e62fdbc18e (diff)
downloadgitpython-123302cee773bc2f222526e036a57ba71d8cafa9.tar.gz
Merge branch 'jonathanchu-master'
Diffstat (limited to 'git/repo/base.py')
-rw-r--r--git/repo/base.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/git/repo/base.py b/git/repo/base.py
index c2bd2a62..bc5a7c35 100644
--- a/git/repo/base.py
+++ b/git/repo/base.py
@@ -682,10 +682,9 @@ class Repo(object):
data = self.git.blame(rev, '--', file, p=True, incremental=True, stdout_as_string=False, **kwargs)
commits = dict()
- stream = iter(data.splitlines())
+ stream = (line for line in data.split(b'\n') if line)
while True:
line = next(stream) # when exhausted, casues a StopIteration, terminating this function
-
hexsha, orig_lineno, lineno, num_lines = line.split()
lineno = int(lineno)
num_lines = int(num_lines)