NotificationsYou must be signed in to change notification settings
Fork2.5k
Star10k

diff: correct diff stat alignment in presence of renames w/ common prefix.#7057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Jump to bottom

Merged

ethomson merged 3 commits intolibgit2:mainfromkivikakk:diff-stat-alignment

Jun 5, 2025

Merged

diff: correct diff stat alignment in presence of renames w/ common prefix.#7057

ethomson merged 3 commits intolibgit2:mainfromkivikakk:diff-stat-alignment

Jun 5, 2025

Conversation

Copy link

Contributor

kivikakk commentedMar 29, 2025

Hi old friends!

I noticed that libgit2's diff stat has its alignment get thrown out in the presence of renames where there's a common prefix, e.g.:

 lib/nos_web/controllers/user_controller.ex                                   | 7 ++++++- lib/nos_web/controllers/{page_html.ex => user_html.ex} | 8 ++----- lib/nos_web/controllers/user_html/show.html.heex                             | 3 +++-

This PR adds a test for this (fails onmain), and then fixes it by reproducing the common prefix detection when calculatinggit_diff_stats'smax_name member. That now fully accounts for the various formats (i.e.samename,oldname => newname,prefix{oldsuffix => newsuffix}).

This removed the sole use ofrenames in the same struct, so I dropped it.