diff options
| author | Vincent Driessen <me@nvie.com> | 2016-05-24 19:28:44 +0200 |
|---|---|---|
| committer | Vincent Driessen <me@nvie.com> | 2016-05-24 19:28:44 +0200 |
| commit | 123302cee773bc2f222526e036a57ba71d8cafa9 (patch) | |
| tree | cebdf30a296c72a2628f06ec8079cc4cf6c7f28a | |
| parent | 7228ca9bf651d9f06395419752139817511aabe1 (diff) | |
| parent | 187fe114585be2d367a81997509b40e62fdbc18e (diff) | |
| download | gitpython-123302cee773bc2f222526e036a57ba71d8cafa9.tar.gz | |
Merge branch 'jonathanchu-master'
| -rw-r--r-- | git/repo/base.py | 3 | ||||
| -rw-r--r-- | git/test/fixtures/blame_incremental | 2 |
2 files changed, 2 insertions, 3 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) diff --git a/git/test/fixtures/blame_incremental b/git/test/fixtures/blame_incremental index 9a0d9e35..67310aec 100644 --- a/git/test/fixtures/blame_incremental +++ b/git/test/fixtures/blame_incremental @@ -7,7 +7,7 @@ committer Sebastian Thiel committer-mail <byronimo@gmail.com> committer-time 1270634931 committer-tz +0200 -summary Used this release for a first beta of the 0.2 branch of development +summary Used this release
for a first beta of the 0.2 branch of development previous 501bf602abea7d21c3dbb409b435976e92033145 AUTHORS filename AUTHORS 82b8902e033430000481eb355733cd7065342037 14 14 1 |