470434 – [gitflow] feature rebase sometimes fails silently

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

Bug 470434 - [gitflow] feature rebase sometimes fails silently

Summary: [gitflow] feature rebase sometimes fails silently

Status:	RESOLVED FIXED

Alias:	None

Product:	EGit
Classification:	Technology
Component:	Gitflow (show other bugs)
Version:	4.0
Hardware:	All All

Importance:	P3 normal (vote)
Target Milestone:	4.1
Assignee:	Max Hohenegger
QA Contact:	Max Hohenegger

URL:
Whiteboard:
Keywords:

Depends on:	470710
Blocks:
	Show dependency tree

Reported:	2015-06-17 18:30 EDT by Max Hohenegger
Modified:	2015-07-22 19:18 EDT (History)
CC List:	2 users (show)

See Also:	Gerrit Change Gerrit Change Git Commit

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 Max Hohenegger

2015-06-17 18:30:50 EDT

This happened to me in several occasions, but I wasn't always sure why. But it is not surprising because currently only two out of five unsuccessful states are handled.
I'd suggest show a warning for all of those states, including the name of the state, i.e. FAILED, STOPPED, ABORTED, UNCOMMITTED, CONFLICTS.

Comment 1 Max Hohenegger

2015-06-19 14:11:07 EDT

https://git.eclipse.org/r/#/c/50558/

Comment 2 Andrey Loskutov

2015-07-05 13:05:59 EDT

org.eclipse.egit.ui.gitflow.FeatureRebaseHandlerTest.testRebase is failing with rebased patch.

Comment 3 Max Hohenegger

2015-07-08 05:26:29 EDT

Tests are now fixed.

Comment 4 Eclipse Genie

2015-07-22 19:17:01 EDT

Gerrit change https://git.eclipse.org/r/50558 was merged to [master].
Commit: http://git.eclipse.org/c/egit/egit.git/commit/?id=bcfcb1deca78c932f24c3cbc0c7358512b180ce3

Comment 5 Matthias Sohn

2015-07-22 19:18:27 EDT

merged the fix