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

Indicate cherry picks #861

Open
cmsolomon opened this issue Dec 19, 2024 · 0 comments
Open

Indicate cherry picks #861

cmsolomon opened this issue Dec 19, 2024 · 0 comments
Assignees
Labels
feature request Feature request

Comments

@cmsolomon
Copy link

Add a graphical indication of a cherry pick
At the moment, if I have 2 branches showing (e.g. a release branch and a develop branch), and I have committed a bugfix to develop and cherry-picked it to release, the commit will be shown twice, once for each branch.

It would be nice if there was an option to enable collapsing the cherry-picks and original commits to a single line, perhaps with some graphical indicator on the graph (e.g. a horizontal line between all branches involved - if a branch is being displayed but didn't get the cherry pick, then there would be no 'dot' on that branch at the intersect of the horizontal line).

This does leave an open questions around ordering - the cherry pick will likely be done some time after the original commit, if there was another commit in between, which order to use?
You could possibly use the ordering from the current branch, if one of the branches in question is the current branch, or you could use the earliest or latest time. (as per user preference).

I'd also suggest un-collapsing the cherry pick line if it was selected?

Since there is no mechanism I am aware of in Git to link the cherry pick to the original commit, maybe some sort of commit message based matching could be used?
In github if I have an original PR, it will have the commit message followed by the PR number, e.g.
Very important bugfix (#1234)
Then the cherry pick would be
Very important bugfix (#1234) (#1235)
It seems like this would be easy to match by looking for matching PR numbers?

@cmsolomon cmsolomon added the feature request Feature request label Dec 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature request Feature request
Projects
None yet
Development

No branches or pull requests

2 participants