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

Bug 347811

Summary:	MergeCommand leaves the index locked after a failure
Product:	[Technology] JGit	Reporter:	ákos tajti <akos.tajti>
Component:	JGit	Assignee:	Project Inbox <jgit.core-inbox>
Status:	RESOLVED FIXED	QA Contact:
Severity:	normal
Priority:	P3	CC:	christian.halstrick, matthias.sohn
Version:	unspecified
Target Milestone:	---
Hardware:	PC
OS:	Windows 7
Whiteboard:

Description ákos tajti

2011-05-31 11:01:54 EDT

Build Identifier: 

When executing MergeCommand there was an exception but the index.lock file wasn't deleted from the repo. Here is the relevant code:

MergeCommand mc = git.merge();
mc.include(repo.resolve(mergeWith));
MergeResult result = mc.call();

Reproducible: Always

Comment 1 Kevin Sawicki

2012-05-11 12:52:40 EDT

I believe this has been fixed by commit eb46d7ffdc6dee1f8570d4be3b6c33cee8fa91c7 which is in the 1.1+ releases.