MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

KT-8632 workaround

Browse Source
This commit is contained in:
Vladimir Krivosheev
2015-07-27 10:15:14 +02:00
parent 2c8e68e3fc
commit 58467c75f0
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/settings-repository/src/git/GitRepositoryManager.kt
+3 -5
View File
@@ -35,11 +35,8 @@ import org.jetbrains.jgit.dirCache.DeleteDirectory
import org.jetbrains.jgit.dirCache.deletePath
import org.jetbrains.jgit.dirCache.edit
import org.jetbrains.keychain.CredentialsStore
import org.jetbrains.settingsRepository.AuthenticationException
import org.jetbrains.settingsRepository.BaseRepositoryManager
import org.jetbrains.settingsRepository.LOG
import org.jetbrains.settingsRepository.*
import org.jetbrains.settingsRepository.RepositoryManager.Updater
import org.jetbrains.settingsRepository.RepositoryService
import java.io.File
import java.io.IOException
import kotlin.concurrent.write
@@ -172,7 +169,8 @@ class GitRepositoryManager(private val credentialsStore: NotNullLazyValue<Creden
return object : Updater {
override var definitelySkipPush = false
override fun merge() = lock.write {
// KT-8632
override fun merge(): UpdateResult? = lock.write {
val committed = commit(pullTask.indicator)
if (refToMerge == null && !committed && getAheadCommitsCount() == 0) {
definitelySkipPush = true