umpf: two fixes for flags propagation#61
Merged
michaelolbrich merged 2 commits intopengutronix:masterfrom Oct 28, 2025
Merged
Conversation
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>
When runing 'umpf show' on an umerge, all lines are explicitly generated. There is no code for the flags, so they are not shown even though they are available internally and running e.g. 'umpf tag' propagates the flags correctly. Add the relevant code so that 'umpf show' works correctly as well. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
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
1 participant
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.
This fixes propagating flags from
utags/useriestoumergesand fixes the output ofumpf showforumergeswith flags.Based on and insipred by #60.