George,

My original patch for this issue introduced other regressions and needed 
to be reverted. I don't recommend using it.

Instead, can you take a look at:

  
https://lore.kernel.org/git/20260215201748.889866-1-ask+git@howdoi.land/ (local)

which removes the "ignore other splits" optimization altogether. After 
some research, I suspect that this optimization may not have enough 
information to work correctly and preserve history in all cases.

I'd also appreciate testing of

  
https://lore.kernel.org/git/20260215201748.889866-1-ask+git@howdoi.land/ (local)

which fixes a "recursion depth exceeded" bug on Debian/Ubuntu.

I've CC'd you on both of these patch series.

I have tested both of these on selected subdirectories of your athena 
repository. They seem to work. But I'd appreciate it if you could look 
at all the splits you normally do and see if the patches correctly 
preserve history for you.

Thanks,

Colin