Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 336768 - Error in rebase, Wrong Repository State: SAFE
Summary: Error in rebase, Wrong Repository State: SAFE
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: Core (show other bugs)
Version: 0.11   Edit
Hardware: Macintosh Mac OS X
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Jens Baumgart CLA
QA Contact:
URL:
Whiteboard:
Keywords:
: 338388 (view as bug list)
Depends on:
Blocks:
 
Reported: 2011-02-09 16:59 EST by Robin Rosenberg CLA
Modified: 2011-03-06 17:00 EST (History)
3 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Robin Rosenberg CLA 2011-02-09 16:59:14 EST
Try to rebase when the result would be a fast-forward. It seem rebase assume it will have to enter
rebase mode and cherry-pick. When a fast-forward would be the result rebase gets confused
and no rebase takes place, not even the fast-forward operation.

-- Error Details --
Date: Wed Feb 09 01:25:49 CET 2011
Message: Wrong Repository State: SAFE
Severity: Error
Product: Eclipse SDK 3.5.2.v201002111343 (org.eclipse.sdk.ide)
Plugin: org.eclipse.egit.core
Session Data:
eclipse.buildId=M20100211-1343
java.version=1.6.0_22
java.vendor=Apple Inc.
BootLoader constants: OS=macosx, ARCH=x86_64, WS=cocoa, NL=sv_SE
Framework arguments:  -keyring /Users/me/.eclipse_keyring -showlocation
Command-line arguments:  -os macosx -ws cocoa -arch x86_64 -keyring /Users/me/.eclipse_keyring -showlocation


Exception Stack Trace:
org.eclipse.jgit.api.errors.WrongRepositoryStateException: Wrong Repository State: SAFE
at org.eclipse.jgit.api.RebaseCommand.checkParameters(RebaseCommand.java:656)
at org.eclipse.jgit.api.RebaseCommand.call(RebaseCommand.java:197)
at org.eclipse.egit.core.op.RebaseOperation$1.run(RebaseOperation.java:99)
at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1800)
at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:1782)
at org.eclipse.egit.core.op.RebaseOperation.execute(RebaseOperation.java:112)
at org.eclipse.egit.ui.internal.rebase.RebaseHelper$1.run(RebaseHelper.java:59)
at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55)
Comment 1 Stefan Lay CLA 2011-02-28 09:36:17 EST
*** Bug 338388 has been marked as a duplicate of this bug. ***
Comment 2 Jens Baumgart CLA 2011-03-03 06:35:12 EST
Fix proposed: http://egit.eclipse.org/r/2633
Comment 3 Matthias Sohn CLA 2011-03-06 17:00:19 EST
merged as 28bda858c223b8fba3815f2586a5ac9346afc40f