Merge branch 'master' of https://github.com/Programming-Toolkit/javaToolkit

Author: maxxbw

lib/utils/GitUtil.java

@@ -3,10 +3,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
-import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 public class GitUtil {
 
@@ -183,6 +180,17 @@ public static Boolean checkout(Path repoDir, String com, Boolean ifForce) {
 		}
 		pr = ProcessUtil.executeCMD(checkoutCMD, null, repoDir, 0);
 
+		if (pr.err.contains("fatal: index file smaller than expected")) {
+			Path lockFilePath = Paths.get(repoDir.toString() + "/.git/index.lock");
+			if (lockFilePath.toFile().exists()) {
+				lockFilePath.toFile().delete();
+			}
+			Path indexFilePath = Paths.get(repoDir.toString() + "/.git/index");
+			if (indexFilePath.toFile().exists()) {
+				indexFilePath.toFile().delete();
+			}
+		}
+
 		if (pr.exitCode == 0) {
 			return true;
 		} else {