Commit 6e86f8a
Fixed consecutive lines with same blame info not appearing in blame.
This fixes a bug when parsing blame -p output: Full commit info headers
only appear for the first line from a particular commit, but other lines
were ignored as the blame info dict was reset after each line.
This patch handles both multiple consecutive lines from a commit and
interleaved lines from multiple commits.
Added real test to verify blame works against the actual commit, not
only a mock of what was produced by blame in old git releases1 parent a848569 commit 6e86f8aCopy full SHA for 6e86f8a
2 files changed
+14-2Lines changed: 14 additions & 2 deletions
Expand file treeCollapse file tree
Open diff view settings
Collapse file
+5-2Lines changed: 5 additions & 2 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
701 | 701 | |
702 | 702 | |
703 | 703 | |
| 704 | + |
| 705 | + |
| 706 | + |
704 | 707 | |
705 | 708 | |
706 | 709 | |
| ||
747 | 750 | |
748 | 751 | |
749 | 752 | |
750 | | - |
751 | | - |
| 753 | + |
| 754 | + |
752 | 755 | |
753 | 756 | |
754 | 757 | |
|
Collapse file
+9Lines changed: 9 additions & 0 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
283 | 283 | |
284 | 284 | |
285 | 285 | |
| 286 | + |
| 287 | + |
| 288 | + |
| 289 | + |
| 290 | + |
| 291 | + |
| 292 | + |
| 293 | + |
| 294 | + |
286 | 295 | |
287 | 296 | |
288 | 297 | |
|
0 commit comments