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

Bug 356918

Summary:	Fast-forward merge fails with JGitInternalException when work tree is dirty
Product:	[Technology] JGit	Reporter:	Tomasz Zarna <tomasz.zarna>
Component:	JGit	Assignee:	Project Inbox <jgit.core-inbox>
Status:	NEW ---	QA Contact:
Severity:	normal
Priority:	P3	CC:	caniszczyk, christian.halstrick, remy.suen, robin.rosenberg, Szymon.Brandys
Version:	1.1
Target Milestone:	---
Hardware:	PC
OS:	Windows XP
URL:	https://git.eclipse.org/r/#/c/4177
Whiteboard:
Bug Depends on:
Bug Blocks:	356943

Description Tomasz Zarna

2011-09-07 08:11:01 EDT

The exception:

org.eclipse.jgit.api.errors.JGitInternalException: Exception caught during execution of merge command. org.eclipse.jgit.errors.CheckoutConflictException: Checkout conflict with files: 
a
	at org.eclipse.jgit.api.MergeCommand.call(MergeCommand.java:250)
...

Expected a MergeResult object with MergeFailureReason.DIRTY_WORKTREE as the reason.

Comment 1 Tomasz Zarna

2011-09-07 08:17:10 EDT

Failing test case: http://egit.eclipse.org/r/#change,4177

Comment 2 Tomasz Zarna

2011-09-20 06:39:36 EDT

A fix has been proposed on http://egit.eclipse.org/r/#change,4177.

Comment 3 Szymon Brandys

2011-11-07 05:33:05 EST

Ping. Could someone from the JGit team review the suggested fix, please.

Comment 4 Robin Rosenberg

2013-08-12 18:37:15 EDT

Now at https://git.eclipse.org/r/#/c/4177/3