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

Select commit to cherry-pick #189

Closed
schumaml opened this issue Jun 6, 2016 · 6 comments
Closed

Select commit to cherry-pick #189

schumaml opened this issue Jun 6, 2016 · 6 comments
Assignees
Milestone

Comments

@schumaml
Copy link

schumaml commented Jun 6, 2016

It would be nice to be able to select commits to cherry-pick instead of typing/pasting their hash.

@maks
Copy link
Collaborator

maks commented Jun 6, 2016

Agreed, cherry-picking is an essential part of git. It's definitely on my todo list, though there are a few more higher priority items at the moment so I can't give an eta for it.
There already is a high-level "porcelain" command class:
http://download.eclipse.org/jgit/site/4.2.0-SNAPSHOT/apidocs/org/eclipse/jgit/api/CherryPickCommand.html

so this should straight forward within the existing SGIt structure.

@maks
Copy link
Collaborator

maks commented Jun 6, 2016

Actually I completely missed this: cherry-pick functionality is already in SGit:
https://github.com/sheimi/SGit/blob/master/src/me/sheimi/sgit/repo/tasks/repo/CherryPickTask.java

please raise a new issue if you are having any problems with using it.

@maks maks closed this as completed Jun 6, 2016
@schumaml
Copy link
Author

schumaml commented Jun 6, 2016

Um... this issue is about how cherry-pick works from an UI pov in SGit, not whether it is there or not.

Instead of pasting or typing a hash, I'd like to have an interface to select commit(s) to pick.

@maks
Copy link
Collaborator

maks commented Jun 6, 2016

My apologies @schumaml I read your original message too quickly.
Yes, definitely the UI should be from a list of commits. This is not a huge change but does need some thought into how the UI should look.

@maks maks reopened this Jun 6, 2016
@maks maks added enhancement and removed invalid labels Jun 6, 2016
@bigdavedev
Copy link
Contributor

I can confirm this is the case, however it is a bug in the branch dialog. If you create a local branch with a long name, it won't be able to show it. Likewise remotes/upstream/master shows up as rehs/heads. I haven't looked in to branch dialog yet, but since local branches exhibit strange behaviour, it should be investigated further.

@maks maks self-assigned this Aug 12, 2016
@maks maks added this to the v1.3.3 milestone Aug 12, 2016
@maks maks changed the title Select commit to chery-pick Select commit to cherry-pick Aug 23, 2016
@maks maks modified the milestones: v1.3.4, v1.3.3 Aug 24, 2016
@maks maks modified the milestones: v1.3.4, v1.3.5 Sep 26, 2016
@maks
Copy link
Collaborator

maks commented Nov 2, 2016

This issue was moved to maks/MGit#28

@maks maks closed this as completed Nov 2, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

3 participants