Kevin Hendricks

Okay, as proof of concept I pushed a simple new implementation for find_lcas and can_fast_forward. I have attached a new graph.py here. Please give it a try, unless I am...

Actually, I am just scratching my own itch so to speak. My project Sigil needs the ability to handle merges across different branches in dulwich. So I have created an...

Found a bug specific to can fast forward and fixed it so please try the following instead: [graph.py.zip](https://github.com/jelmer/dulwich/files/11885146/graph.py.zip)

Thanks for letting me know it helped. A more advanced version is now part of my dulwich_merge project. Still waiting to hear if jelmer will merge any of that.

Will do so tomorrow.

Will do. Most are KeyErrors for missing b'Head' and others are revparse head not returning an sha. It is almost as if the fast-import of the testdata repo .export files...

Here is the log from running make check using Apple-Git. With normal git, everything passes: ``` kbhend@MacBook-Pro Desktop % which git /usr/bin/git kbhend@MacBook-Pro Desktop % git --version git version 2.39.2...

With normal git: ``` kbhend@MacBook-Pro Desktop % which git /usr/local/bin/git kbhend@MacBook-Pro Desktop % git --version git version 2.39.3 Same python3, all tests pass: PYTHONHASHSEED=random PYTHONPATH=/Users/kbhend/Desktop/testing/dulwich python3 -m unittest dulwich.tests.test_suite .........................................................................................................s.......................................................................................ss......................................................................sssssssssssss.s......................................s......................s..........................................................................................................................................................................................................................................................................................................................................................................................................................................s..................................................ss..............................................................127.0.0.1...

Yes, I looked for about an hour, even managed to add progress and checkpoint commands to the testdata/repos/ .export files and checked that "progress done" was emitted by apple-git when...

FYI, Sigil is a cross platform Qt 6.5.2 app (open source ebook editor) and one of our macOS user's reported crashes related to Rectangle.app and Sigil-2.0.1. The backtraces show a...