Skip to content

Merge v0.2.1 release related commit into master (versioning of Heads changes from 0.2.0 to 0.2.1+number of commits since 0.2.1 in versioning info, filename etc)#2049

Merged
tlaurion merged 2 commits intolinuxboot:masterfrom
tlaurion:test-merge-v0.2.1
Jan 28, 2026

Conversation

@tlaurion
Copy link
Copy Markdown
Collaborator

@tlaurion tlaurion commented Jan 27, 2026

@notgivenby found that for unknown reasons of me, 7f2eb15 which is commit of release 0.2.1 (see v0.2.0...v0.2.1) was never part of master.

For reference, this old commit goal was for recovery shell to extend pcrs, which is since then made in etc/functions:recovery.
Nothing new in that commit vs master.

This empty commit merges the missing commit (in git terms to track 0.2.1 into master) which is an empty commit (no file changes)

In my local branch I now see:

user@heads-notgivenby:~/heads$ git describe --abbrev=7 --tags --dirty
v0.2.1-2886-g9a402a0

Where otherwise, origin/master shows:

user@heads-notgivenby:~/heads$ git describe --abbrev=7 --tags --dirty
v0.2.0-2885-ga44a0ab

Am I doing something stupid here?
Unfortunately, DCO fails because 7f2eb15 is not signoff, while signed (GPG signed) without signoff which DCO is complaining about here.

I can relax the check here but that is that.

@tlaurion tlaurion force-pushed the test-merge-v0.2.1 branch 2 times, most recently from 71add5c to e225518 Compare January 27, 2026 17:37
…igned merge commit — no net content change vs origin/master)

Signed-off-by: Thierry Laurion <insurgo@riseup.net>
@tlaurion tlaurion changed the title Test merge v0.2.1 Merge v0.2.1 release into master (versioning of Heads changes from 0.2.0 to 0.2.1) Jan 27, 2026
@tlaurion tlaurion changed the title Merge v0.2.1 release into master (versioning of Heads changes from 0.2.0 to 0.2.1) Merge v0.2.1 release into master (versioning of Heads changes from 0.2.0 to 0.2.1+number of commits since 0.2.1 in versioning info, filename etc) Jan 27, 2026
@tlaurion
Copy link
Copy Markdown
Collaborator Author

tlaurion commented Jan 27, 2026

@macpijan does that effect downstream in any way? Am I doing something wrong here? merging 7f2eb15 and fixing conflicts (no change empty merge commit in 9a402a0 so we are on top of release 0.2.1 not 0.2.0 anymore)

@tlaurion tlaurion changed the title Merge v0.2.1 release into master (versioning of Heads changes from 0.2.0 to 0.2.1+number of commits since 0.2.1 in versioning info, filename etc) Merge v0.2.1 release related commit into master (versioning of Heads changes from 0.2.0 to 0.2.1+number of commits since 0.2.1 in versioning info, filename etc) Jan 27, 2026
@tlaurion tlaurion modified the milestone: 0.3 Jan 27, 2026
@macpijan
Copy link
Copy Markdown
Collaborator

I do not think it matters from our perspective. When we made a release, we used to make a tag on our own, in a downstream repo. So we do not rely on this old heads tag.

@macpijan macpijan self-requested a review January 28, 2026 10:35
@tlaurion tlaurion merged commit a601d05 into linuxboot:master Jan 28, 2026
53 of 54 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants