Merge "Remove duplicate calls to DirCache.unlock on checkout"

org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java

@@ -396,10 +396,9 @@ public class DirCacheCheckout {
 				prescanOneTree();
 
 			if (!conflicts.isEmpty()) {
-				if (failOnConflict) {
+				if (failOnConflict)
-					dc.unlock();
 					throw new CheckoutConflictException(conflicts.toArray(new String[conflicts.size()]));
-				} else
+				else
 					cleanUpConflicts();
 			}
 
@@ -448,10 +447,8 @@ public class DirCacheCheckout {
 			}
 
 			// commit the index builder - a new index is persisted
-			if (!builder.commit()) {
+			if (!builder.commit())
-				dc.unlock();
 				throw new IndexWriteException();
-			}
 		} finally {
 			objectReader.release();
 		}