--first-parent is a nice option I wasn't aware of. But it would still depend on upstream not merging PRs failing the test suite.