Re: [PATCH] blame: fix coloring for repeated suspects
- From
René Scharfe <l.s.r@web.de>
- Date
- Feb 2, 2026, 16:24 UTC
- Message-ID
- <62e3ab10-bfa4-4ec7-9838-0bad89d04edd@web.de>
- In-Reply-To
- <xmqqfr7j2u6q.fsf@gitster.g>
On 2/2/26 1:42 PM, Junio C Hamano wrote:
Show 7 quoted lines
> René Scharfe <l.s.r@web.de> writes: > >> The option --ignore-rev passes the blame to an older commit. This can >> cause adjacent scoreboard entries to blame the same commit. Currently >> we only look a the present entry when determining whether a line needs > > "look at"?
Yes.
Show 9 quoted lines
>> to be colored for --color-lines. Check the previous entry as well. > > While this should work, I am kind of surprised that this has to done > as a sepecial case. It often happens that two adjacent blocks may > be originally pass their blames to different parents of a merge, but > then the blame passes down through both branches down to the same > ancestor, at which point these two blocks need to be merged back > into the same source again, and I was hoping that a helper function > for it would be called to take care of this case as well.
Do you mean blame_coalesce()? It is called, but won't merge entries that are not ignored with those that are. And we do need to keep them separate for blame.markignoredlines to work.
René