Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

umpf: call rev-parse on manually selected local branches as well #25

Merged
merged 1 commit into from
Sep 5, 2023
Merged

umpf: call rev-parse on manually selected local branches as well #25

merged 1 commit into from
Sep 5, 2023

Commits on Sep 5, 2023

  1. umpf: call rev-parse on manually selected local branches as well 

    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
    a3f committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    6973dd0 View commit details
    Browse the repository at this point in the history