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

Bug 338388

Summary:	rebase fails with 'Wrong Repository State: SAFE'
Product:	[Technology] EGit	Reporter:	Edwin Kempin <edwin.kempin>
Component:	Core	Assignee:	Jens Baumgart <jens.baumgart>
Status:	CLOSED DUPLICATE	QA Contact:
Severity:	normal
Priority:	P3	CC:	stefan.lay
Version:	0.12
Target Milestone:	---
Hardware:	PC
OS:	Windows 7
Whiteboard:

Description Edwin Kempin

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

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

2011-02-28 09:36:17 EST


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