umpf: keep the first commit-ish for a branch when creating the umpf from an umerge#57
Merged
Merged
Conversation
…rom an umerge When an umpf is created from a umerge, the same topic branch may be found multiple times: 1. The actual merge for the topic in the umerge 2. as a base for another topic The commit-ish from the first case is the relevant one. All others may use older versions of the topic branch, so ignore those when creating the useries. Without this, creating an identical tag from a umerge will use the wrong version of the topic branch. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Member
|
I am wondering if we shouldn't have a strict mode that would verify that we don't have conflicting hashes for the same topic, This fix works for me though, so: |
Member
Author
|
If the hashes conflict, then |
Member
|
I meant the situation of having a stale umpf merge while the topic branch is newer. Do you not think it's worth nudging users to fix this? |
Member
Author
|
It's explicitly supported by umpf that you can use an older version as base. That avoids unnecessary rebasing. |
Member
|
Fair enough. Maybe a potential --strict should rather support failing the umpf tag on conflicts instead. |
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.
When an umpf is created from a umerge, the same topic branch may be found multiple times:
The commit-ish from the first case is the relevant one. All others may use older versions of the topic branch, so ignore those when creating the useries.
Without this, creating an identical tag from a umerge will use the wrong version of the topic branch.