Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 357312

Summary: Tell the user which commit cannot be cherry-picked because it has more than one parent
Product: [Technology] JGit Reporter: Remy Suen <remy.suen>
Component: JGitAssignee: Kevin Sawicki <kevin>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: P3 CC: robin.rosenberg
Version: 1.1   
Target Milestone: ---   
Hardware: All   
OS: All   
Whiteboard:

Description Remy Suen CLA 2011-09-10 16:20:48 EDT 
When a rebase fails because a commit seems to have more than one parent, you will get an exception saying "Can only cherry-pick commits which have exactly one parent".

Could the SHA-1 hash of the commit in question please be included in the error message so that the user can quickly identify which commit is the one that's causing the problem?
Comment 1 Kevin Sawicki CLA 2011-12-14 16:35:45 EST 
Proposed fix pushed to: http://egit.eclipse.org/r/#change,4820
Comment 2 Robin Rosenberg CLA 2011-12-27 18:01:17 EST 
Merged 3c7dceec1a7dc367a3e716331bacc37b74e3f6e0