diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2013-02-21 00:07:33 +0100 |
|---|---|---|
| committer | Robin Stocker <robin@nibor.org> | 2013-03-08 16:40:19 +0100 |
| commit | 3ad454497cdb6a917c00b01c735f5a469b8fb2ff (patch) | |
| tree | a5caca7d4f790f4e76c4e8a775f281a0270e1c3d /org.eclipse.jgit/src/org/eclipse/jgit/api | |
| parent | 08d5ede281843701ba709ef4f6f4336958f215d5 (diff) | |
| download | jgit-3ad454497cdb6a917c00b01c735f5a469b8fb2ff.tar.gz jgit-3ad454497cdb6a917c00b01c735f5a469b8fb2ff.zip | |
Do not cherry-pick merge commits during rebase
Rebase computes the list of commits that are included in
the merges, just like Git does, so do not try to include
the merge commits. Re-recreating merges during rebase is
a bit more complicated and might be a useful future extension,
but for now just linearize during rebase.
Change-Id: I61239d265f395e5ead580df2528e46393dc6bdbd
Signed-off-by: Robin Stocker <robin@nibor.org>
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/api')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java index 5158c8533b..a100c9d878 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java @@ -640,11 +640,7 @@ public class RebaseCommand extends GitCommand<RebaseResult> { List<RevCommit> cherryPickList = new ArrayList<RevCommit>(); for (RevCommit commit : commitsToUse) { if (commit.getParentCount() != 1) - throw new JGitInternalException( - MessageFormat.format( - JGitText.get().canOnlyCherryPickCommitsWithOneParent, - commit.name(), - Integer.valueOf(commit.getParentCount()))); + continue; cherryPickList.add(commit); } |