umpf: add built-in support for synchronizing topic branches#53
Merged
michaelolbrich merged 1 commit intopengutronix:masterfrom Oct 17, 2025
Merged
Conversation
a3f
force-pushed
the
afa/umpf-push-pull-legs
branch
2 times, most recently
from
4353753 to
b48609e
Compare
michaelolbrich
requested changes
Jan 31, 2025
Member
michaelolbrich
left a comment
michaelolbrich
left a comment
There was a problem hiding this comment.
I really like this in general. A lot of small stuff, and as noted below, I think you can remove the local special case.
umpf
Outdated
| fi | ||
|
|
||
| local rtagrev="$(resolve_tag "${remote}" ${tagname})" | ||
| local rtagrevf="$(resolve_commitish ${rtagrev}^)" |
Member
There was a problem hiding this comment.
use resolve_tag here as well to make it less confusing.
Member
Author
There was a problem hiding this comment.
Using rev-parse on FETCH_HEAD^ as resolve_remote_tag uses ls-remote which can't deal with ^
Member
Author
There was a problem hiding this comment.
This is now local rtagrevf="$(${GIT} rev-parse --revs-only "FETCH_HEAD^" 2>/dev/null)"
a3f
force-pushed
the
afa/umpf-push-pull-legs
branch
from
b48609e to
4602b01
Compare
a3f
force-pushed
the
afa/umpf-push-pull-legs
branch
from
4602b01 to
14dbf0f
Compare
a3f
force-pushed
the
afa/umpf-push-pull-legs
branch
2 times, most recently
from
2f1ffad to
0269e99
Compare
Member
Author
|
I reworked the PR after discussion with @michaelolbrich. Key changes:
|
michaelolbrich
requested changes
Oct 17, 2025
Member
michaelolbrich
left a comment
michaelolbrich
left a comment
There was a problem hiding this comment.
Almost there just minor stuff left that I should have found earlier. Sorry about that.
While umpf was explicitly developed with multiple developers adding
utags and sharing topic branches in mind, it is less than ideal when
there are multiple developers working on the same topic branches.
And it frequently leads to one of two issues:
- The branch is pushed before the utag is accepted into the BSP
repository and other developers get an unexpected addition to
their umpf
- The branch is not pushed after the utag is accepted into the BSP
repository and other developers get an unexpected removal from
their umpf
Every time this happens, it wastes a bit of time to identify what went
wrong and thus a solution built into umpf is appropriate:
- CI will call umpf --remote=downstream --force push $BSP/series.inc
when a PR touching a useries is accepted
- Developers can call umpf pull to synchronize their topic branches
or to find out when difference they have to the now upstream
version
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
a3f
force-pushed
the
afa/umpf-push-pull-legs
branch
from
0269e99 to
7d0912f
Compare
michaelolbrich
approved these changes
Oct 17, 2025
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 umpf was explicitly developed with multiple developers adding utags and sharing topic branches in mind, it is less than ideal when there are multiple developers working on the same topic branches.
And it frequently leads to one of two issues:
The branch is pushed before the utag is accepted into the BSP repository and other developers get an unexpected addition to their umpf
The branch is not pushed after the utag is accepted into the BSP repository and other developers get an unexpected removal from their umpf
Every time this happens, it wastes a bit of time to identify what went wrong and thus a solution built into umpf is appropriate:
CI will call
umpf --remote=downstream --force push $BSP/series.incwhen a PR touching a useries is acceptedDevelopers can call
umpf pullto synchronize their topic branches or to find out when difference they have to the now upstream version