Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 357312 - Tell the user which commit cannot be cherry-picked because it has more than one parent
Summary: Tell the user which commit cannot be cherry-picked because it has more than o...
Status: RESOLVED FIXED
Alias: None
Product: JGit
Classification: Technology
Component: JGit (show other bugs)
Version: 1.1   Edit
Hardware: All All
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Kevin Sawicki CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-09-10 16:20 EDT by Remy Suen CLA
Modified: 2011-12-27 18:01 EST (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
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