Merge "File.renameTo behaves differently on Unix and Windows"

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

@@ -1126,16 +1126,12 @@ public class DirCacheCheckout {
 					fs.setExecute(tmpFile, false);
 			}
 		}
-		if (!tmpFile.renameTo(f)) {
+		try {
-			// tried to rename which failed. Let' delete the target file and try
+			FileUtils.rename(tmpFile, f);
-			// again
+		} catch (IOException e) {
-			FileUtils.delete(f, FileUtils.EMPTY_DIRECTORIES_ONLY
+			throw new IOException(MessageFormat.format(
-					| FileUtils.RECURSIVE);
+					JGitText.get().couldNotWriteFile, tmpFile.getPath(),
-			if (!tmpFile.renameTo(f)) {
+					f.getPath()));
-				throw new IOException(MessageFormat.format(
-						JGitText.get().couldNotWriteFile, tmpFile.getPath(),
-						f.getPath()));
-			}
 		}
 		entry.setLastModified(f.lastModified());
 		if (opt.getAutoCRLF() != AutoCRLF.FALSE)