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

Cherry pick fail message #1062

Closed
NielBuys opened this issue May 19, 2020 · 3 comments
Closed

Cherry pick fail message #1062

NielBuys opened this issue May 19, 2020 · 3 comments
Labels
enhancement usability

Comments

@NielBuys
Copy link
Contributor

Will it be possible to show a message, if there are merge problems with a cherry pick on the visualize screen. If the Cherry pick has no problems it doesn't need to show a message.

The problem is I sometimes have to cherry pick a couple of commits in sequence. So now I am forced to follow the following procedure.

  1. Right click on Visualize commit and choose Cherry pick.
  2. Open main git-cola screen refresh and look if there is merge conflicts.
  3. Go back to visualize screen Cherry pick next commit.
  4. Go back to main git-cola screen refresh to see if there is merge conflicts.
    etc.

Thanks in advance
davvid added a commit to davvid/git-cola that referenced this issue Feb 5, 2023
@davvid
cmds: display an error message when cherry-pick fails
f1d4c51 
Do not silently fail when "git cherry-pick" returns a non-zero
exit status. Report the error so that the user can respond.

When cherry-picking multiple commits stop processing commits
as soon as the first cherry-pick fails.

Closes git-cola#1062
Reported-by: Niel Buys <nbuys@ncomp.co.za>
Signed-off-by: David Aguilar <davvid@gmail.com>
davvid added a commit to davvid/git-cola that referenced this issue Feb 5, 2023
@davvid
cmds: add an "Abort Cherry-Pick" action
23b63a6 
Cherry-pick can fail and "git cherry-pick --abort" is the only way to
proceed. Add an action for aborting cherry-picks.

Add a new "update_file_merge_status()" model action that updates
staged/modified files and the merge/rebase/cherry-pick status.

Related-to: git-cola#1062
Signed-off-by: David Aguilar <davvid@gmail.com>
@davvid davvid closed this as completed in 53eb7c6 Feb 5, 2023
davvid added a commit that referenced this issue Feb 5, 2023
@davvid
cmds: add an "Abort Cherry-Pick" action
fe6ff2f 
Cherry-pick can fail and "git cherry-pick --abort" is the only way to
proceed. Add an action for aborting cherry-picks.

Add a new "update_file_merge_status()" model action that updates
staged/modified files and the merge/rebase/cherry-pick status.

Related-to: #1062
Signed-off-by: David Aguilar <davvid@gmail.com>
davvid added a commit that referenced this issue Feb 5, 2023
@davvid
CHANGES: update v4.2.0 release notes draft
0f26aa5 
Related-to: #784 #779 #1047 #1062
Signed-off-by: David Aguilar <davvid@gmail.com>
@davvid
Copy link
Member

davvid commented Feb 5, 2023

Thanks for the report. This has been improved and will be part of the upcoming v4.2.0 release.

@davvid davvid mentioned this issue Feb 5, 2023
Closed
@NielBuys
Copy link
Contributor Author

NielBuys commented Feb 6, 2023

Thanks for this. I wanted to test but version 4.2.0 do not work on my Ubuntu 20.04. I created a issue for this. #1286

@NielBuys
Copy link
Contributor Author

NielBuys commented Mar 9, 2023

Thanks for this change. I tested I get a message now when there is merge conflict with an Cherry pick.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
enhancement usability
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@davvid @NielBuys