Bug 420882 - Rebase does nothing when HEAD merged to rebase base
Summary: Rebase does nothing when HEAD merged to rebase base
Status: NEW
Alias: None
Product: JGit
Classification: Technology
Component: JGit (show other bugs)
Version: 3.2   Edit
Hardware: PC Mac OS X
: P3 normal with 1 vote (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-11-01 11:21 EDT by Robin Rosenberg CLA
Modified: 2019-09-05 04:51 EDT (History)
4 users (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 Robin Rosenberg CLA 2013-11-01 11:21:24 EDT 
Create branch off origin/master^
Create a local commit
Merge with origin/master
Rebase on top of orgin/master

In EGit (I believe the issues is actually in JGit) nothing happens.

Expected result:
JGit should rebase (removing the merge in the process).
Comment 1 Robin Stocker CLA 2013-11-01 11:33:52 EDT 
Right, looks like a bug in RebaseCommand (maybe it thinks there is nothing to do because the branch already has origin/master in its parents?). It works as expected in C Git.
Comment 2 Pierre-Yves Bigourdan CLA 2019-09-05 04:51:14 EDT 
This is still an issue with the latest version of JGit/EGit. Rebasing on top of orgin/master is quite a convenient operation in this scenario to get rid of noisy merge commits.