attempt to investigate IDEA-144970 Settings Repository fails to read/merge

This commit is contained in:
Vladimir Krivosheev
2015-11-24 11:25:51 +01:00
parent fbace69103
commit 4c668c5420
@@ -24,6 +24,7 @@ import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.util.text.StringUtil
import com.intellij.util.SmartList
import org.eclipse.jgit.api.AddCommand
import org.eclipse.jgit.api.errors.NoHeadException
import org.eclipse.jgit.api.errors.UnmergedPathsException
import org.eclipse.jgit.errors.TransportException
import org.eclipse.jgit.ignore.IgnoreNode
@@ -138,6 +139,10 @@ class GitRepositoryManager(private val credentialsStore: NotNullLazyValue<Creden
return commitIfCan(indicator, repository.fixAndGetState())
}
}
catch (e: NoHeadException) {
LOG.warn("Cannot commit - no HEAD", e)
return false
}
}
}