Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 338388 - rebase fails with 'Wrong Repository State: SAFE'
Summary: rebase fails with 'Wrong Repository State: SAFE'
Status: CLOSED DUPLICATE of bug 336768
Alias: None
Product: EGit
Classification: Technology
Component: Core (show other bugs)
Version: 0.12   Edit
Hardware: PC Windows 7
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Jens Baumgart CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-02-28 05:31 EST by Edwin Kempin CLA
Modified: 2011-02-28 09:36 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 Edwin Kempin CLA 2011-02-28 05:31:00 EST 
I have a repository with just one branch 'master'. This 'master' branch points to a quite old state but it can be fast forwarded to 'origin/master'.

When I import this repository in EGit, checkout the 'master' branch and try to rebase it to 'origin/master' the rebase fails with 'Wrong Repository State: SAFE'.

Doing the rebase from the command line (msysgit) simply works and the 'master' branch is fast forwarded.
Comment 1 Edwin Kempin CLA 2011-02-28 06:53:19 EST 
Please find the git repository to reproduce the described error here:
http://dl.dropbox.com/u/15639867/gerrit.zip
Comment 2 Stefan Lay CLA 2011-02-28 09:36:17 EST 

*** This bug has been marked as a duplicate of bug 336768 ***