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.

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

cherrypicking from the other branch (behind) in history comparison to the current branch doesn't work #18578

Open
amerhanna opened this issue May 8, 2024 · 0 comments

Comments

@amerhanna
Copy link

The problem

When comparing the current branch to another branch, the commits in the "behind" list (commits on the other branch) cannot be cherrypicked into the current branch.

You have to switch to that branch and cherrypick it from there or do the comparison in reverse.
When you are cherry-picking from the "ahead" tab to another branch it works correctly.

Release version

Version 3.3.14 (x64)

Operating system

Windows 11

Steps to reproduce the behavior

  1. branch "main" is one commit ahead of branch "1-bug"
  2. switch to branch "1-bug" and from the history pane compare it to the "main" branch
  3. from the "behind" tab, right click the commit and select cherrypick commit.
  4. in the cherrypick window try to cherrypick to the current branch "1-bug"
  5. the cherrypick button is disabled and on hover it shows the message: "You are not able to cherry-pick from and to the same branch"

Log files

No response

Screenshots

image

Additional context

It seems like the cherrypick window thinks that the owner branch of the commit is the current branch not the original branch of the commit.
This is corroborated by trying to cherrypick a commit from the compared-to branch to the same branch. it will create an empty commit (cherrypicking from and to the same branch)
image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant