umpf: call rev-parse on manually selected local branches as well #25
Conversation
This file contains 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
Emil-Juhl
reviewed
Sep 5, 2023
a3f
force-pushed
the
afa/revparse-local-branch
branch
from
eb5bd69
to
402918e
Compare
|
This worked for me locally and fixed the hashinfo. So stamp of approval from my side :) Thanks for fixing it! |
When umpf compares branches between all of the known remotes, it will now
prompt the user when it discovers a branch that includes additional commits
compared to the one on the selected remote.
If the user confirms, the branch name is taken as is, which would result in
an umpf-hashinfo of e.g. heads/v6.4/topic/something, which breaks the
ability of doing identical umpfs.
To restore that ability, we use the result of calling rev-parse on the
${branch}, which is conveniently available already in ${b}.
Fixes: 000e642 ("umpf: add branch choice in case of additional commits")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
a3f
force-pushed
the
afa/revparse-local-branch
branch
from
402918e
to
6973dd0
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 umpf compares branches between all of the known remotes, it will now prompt the user when it discovers a branch that includes additional commits compared to the one on the selected remote.
If the user confirms, the branch name is taken as is, which would result in an umpf-hashinfo of e.g. heads/v6.4/topic/something, which breaks the ability of doing identical umpfs.
To restore that ability, we need to call rev-parse on the ${branch}.
Fixes: 000e642 ("umpf: add branch choice in case of additional commits")