Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 347811 - MergeCommand leaves the index locked after a failure
Summary: MergeCommand leaves the index locked after a failure
Status: RESOLVED FIXED
Alias: None
Product: JGit
Classification: Technology
Component: JGit (show other bugs)
Version: unspecified   Edit
Hardware: PC Windows 7
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-05-31 11:01 EDT by ákos tajti CLA
Modified: 2012-05-11 12:52 EDT (History)
2 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 ákos tajti CLA 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 CLA 2012-05-11 12:52:40 EDT 
I believe this has been fixed by commit eb46d7ffdc6dee1f8570d4be3b6c33cee8fa91c7 which is in the 1.1+ releases.