On 20/03/2023 14:37, Kevin Brodsky wrote:
On 20/03/2023 09:51, Alex Lennon wrote:
Thanks - have you any idea what’s gone on upstream? Can’t quite see how the commit has gone off the branch unless somebody has done some weird force push?
As Pawel suggested, morello/master has been rebased on 6.1, following morello/next. The rebase of next was announced a few weeks ago [1], master was then aligned with next last week. It does mean force-pushing unfortunately. Will make sure to send an email to both lists when rebasing master next time round.
If you want to use a fixed revision, I think Pawel's patch makes sense - it may disappear from master as we rebase, but it will always remain reachable at least through a morello-last-* tag.
Going forward, it may be better to use a release tag than an arbitrary revision.
Thanks for the explanation Kevin. It's up to Pawel of course but I'm used to using fixed commit hashes with Yocto so things don't change underneath me.
I guess that means nobranch=1 would be my preference if commits can go missing from master.
Cheers,
Alex