Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 356918 - Fast-forward merge fails with JGitInternalException when work tree is dirty
Summary: Fast-forward merge fails with JGitInternalException when work tree is dirty
Status: NEW
Alias: None
Product: JGit
Classification: Technology
Component: JGit (show other bugs)
Version: 1.1   Edit
Hardware: PC Windows XP
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL: https://git.eclipse.org/r/#/c/4177
Whiteboard:
Keywords:
Depends on:
Blocks: 356943
  Show dependency tree
 
Reported: 2011-09-07 08:11 EDT by Tomasz Zarna CLA
Modified: 2013-08-12 18:37 EDT (History)
5 users (show)

See Also:

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 Tomasz Zarna CLA 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 CLA 2011-09-07 08:17:10 EDT 
Failing test case: http://egit.eclipse.org/r/#change,4177
Comment 2 Tomasz Zarna CLA 2011-09-20 06:39:36 EDT 
A fix has been proposed on http://egit.eclipse.org/r/#change,4177.
Comment 3 Szymon Brandys CLA 2011-11-07 05:33:05 EST 
Ping. Could someone from the JGit team review the suggested fix, please.
Comment 4 Robin Rosenberg CLA 2013-08-12 18:37:15 EDT 
Now at https://git.eclipse.org/r/#/c/4177/3