umpf: preserve flags between utags and umerges#60
Closed
sipraga wants to merge 1 commit into
Closed
Conversation
While tags are correctly stored and loaded via useries files, the same is not entirely the case for utags and umerges: 1. utags are correctly annotated with '# umpf-flags: flag=val'. But when running a build command from such a utag, the flag is not parsed. Add the appropriate build namespace parser function. 2. Flags are correctly parsed from umerges, but only if they are annotated correctly via git-notes. An incorrect bashism assumes the flags are stored in a file as opposed to a variable, breaking the annotation. Fix it. With these changes, tags are correctly preserved between a series of commands like: git checkout <tag>; umpf build; umpf merge; umpf tag. Signed-off-by: Alvin Šipraga <alvin@pqrs.dk>
michaelolbrich
added a commit
to michaelolbrich/umpf
that referenced
this pull request
Oct 17, 2025
The flags are never stored in a file. So creating the umpf-build-flags note from a file is a noop and the flags are lost. Instead, handle flags like the 'relative'. Set the FLAGS variable when flags are found and use that to create the note. This is a modified version of pengutronix#60 from Alvin Šipraga <alvin@pqrs.dk>. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Member
|
Right. This is technically correct, but I want so solve it differently. The flags work mostly the same as Also, while testing this stuff I noticed that |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
While tags are correctly stored and loaded via useries files, the same is not entirely the case for utags and umerges:
utags are correctly annotated with '# umpf-flags: flag=val'. But when running a build command from such a utag, the flag is not parsed. Add the appropriate build namespace parser function.
Flags are correctly parsed from umerges, but only if they are annotated correctly via git-notes. An incorrect bashism assumes the flags are stored in a file as opposed to a variable, breaking the annotation. Fix it.
With these changes, tags are correctly preserved between a series of commands like: git checkout ; umpf build; umpf merge; umpf tag.