Bug 336768

Description Robin Rosenberg 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)