Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 478518 - Finishing and squashing a feature branch consistently aborts in bigger workspaces
Summary: Finishing and squashing a feature branch consistently aborts in bigger worksp...
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: Gitflow (show other bugs)
Version: 4.1   Edit
Hardware: All All
: P3 major (vote)
Target Milestone: 4.2   Edit
Assignee: Max Hohenegger CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-09-28 05:32 EDT by Max Hohenegger CLA
Modified: 2015-10-03 16:59 EDT (History)
1 user (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Max Hohenegger CLA 2015-09-28 05:32:28 EDT
I'm not sure why, but I get an InterruptedException when trying to join the job that is responsible for merging, hence the dialog for editing the commit message never opens, and the changes are not committed.
I assume there is a timeout on the handlers thread.

Thread [main] (Suspended (exception java.lang.InterruptedException))	
	org.eclipse.core.internal.jobs.JobManager.join(java.lang.Object, org.eclipse.core.runtime.IProgressMonitor) line: 1002	
	org.eclipse.egit.gitflow.ui.internal.actions.FeatureFinishHandler.execute(org.eclipse.core.commands.ExecutionEvent) line: 89	
	org.eclipse.ui.internal.handlers.HandlerProxy.execute(org.eclipse.core.commands.ExecutionEvent) line: 295	
	org.eclipse.ui.internal.handlers.E4HandlerProxy.execute(org.eclipse.e4.core.contexts.IEclipseContext, java.util.Map, org.eclipse.swt.widgets.Event, org.eclipse.core.expressions.IEvaluationContext) line: 90	
	sun.reflect.NativeMethodAccessorImpl.invoke0(java.lang.reflect.Method, java.lang.Object, java.lang.Object[]) line: not available [native method]	
	sun.reflect.NativeMethodAccessorImpl.invoke(java.lang.Object, java.lang.Object[]) line: not available	
	sun.reflect.DelegatingMethodAccessorImpl.invoke(java.lang.Object, java.lang.Object[]) line: not available	
	java.lang.reflect.Method.invoke(java.lang.Object, java.lang.Object...) line: not available	
	org.eclipse.e4.core.internal.di.MethodRequestor.execute() line: 56
Comment 1 Eclipse Genie CLA 2015-09-28 06:00:01 EDT
New Gerrit change created: https://git.eclipse.org/r/56823
Comment 2 Eclipse Genie CLA 2015-10-03 16:59:28 EDT
Gerrit change https://git.eclipse.org/r/56823 was merged to [master].
Commit: http://git.eclipse.org/c/egit/egit.git/commit/?id=b3cef7557bc9a589f74720444dc55d5ef0cabe3b
Comment 3 Matthias Sohn CLA 2015-10-03 16:59:50 EDT
submitted