mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
attempt to investigate IDEA-144970 Settings Repository fails to read/merge
This commit is contained in:
@@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user