Skip to content

Commit 123302c

Browse files
committed
Merge branch 'jonathanchu-master'
2 parents 7228ca9 + 187fe11 commit 123302c

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

git/repo/base.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -682,10 +682,9 @@ def blame_incremental(self, rev, file, **kwargs):
682682
data = self.git.blame(rev, '--', file, p=True, incremental=True, stdout_as_string=False, **kwargs)
683683
commits = dict()
684684

685-
stream = iter(data.splitlines())
685+
stream = (line for line in data.split(b'\n') if line)
686686
while True:
687687
line = next(stream) # when exhausted, casues a StopIteration, terminating this function
688-
689688
hexsha, orig_lineno, lineno, num_lines = line.split()
690689
lineno = int(lineno)
691690
num_lines = int(num_lines)

git/test/fixtures/blame_incremental

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ committer Sebastian Thiel
77
committer-mail <byronimo@gmail.com>
88
committer-time 1270634931
99
committer-tz +0200
10-
summary Used this release for a first beta of the 0.2 branch of development
10+
summary Used this release for a first beta of the 0.2 branch of development
1111
previous 501bf602abea7d21c3dbb409b435976e92033145 AUTHORS
1212
filename AUTHORS
1313
82b8902e033430000481eb355733cd7065342037 14 14 1

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy