Repository navigation
Commit 7725e03
committed
Ignore all lines of subsequent hunks until last one is found
Git version 2.11.1+ introduced extra lines into the subsequent hunk
sections for incremental blame output. The documentation notes that
parsers of this output should ignore all lines between the start and end
for robust parsing.1 parent 830070d commit 7725e03
1 file changed
Lines changed: 8 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -713,11 +713,14 @@ def blame_incremental(self, rev, file, **kwargs): | |||
| 713 | 713 | committed_date=int(props[b'committer-time'])) | |
| 714 | 714 | commits[hexsha] = c | |
| 715 | 715 | else: | |
| 716 | - # Discard the next line (it's a filename end tag) | ||
| 717 | - line = next(stream) | ||
| 718 | - tag, value = line.split(b' ', 1) | ||
| 719 | - assert tag == b'filename', 'Unexpected git blame output' | ||
| 720 | - orig_filename = value | ||
| 716 | + # Discard all lines until we find "filename" which is | ||
| 717 | + # guaranteed to be the last line | ||
| 718 | + while True: | ||
| 719 | + line = next(stream) | ||
| 720 | + tag, value = line.split(b' ', 1) | ||
| 721 | + if tag == b'filename': | ||
| 722 | + orig_filename = value | ||
| 723 | + break | ||
| 721 | 724 | ||
| 722 | 725 | yield BlameEntry(commits[hexsha], | |
| 723 | 726 | range(lineno, lineno + num_lines), | |
0 commit comments