From 58467c75f015afbcdff68418c2e822c1714a9274 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Mon, 27 Jul 2015 10:15:14 +0200
Subject: [PATCH] KT-8632 workaround

---
 .../settings-repository/src/git/GitRepositoryManager.kt   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/plugins/settings-repository/src/git/GitRepositoryManager.kt b/plugins/settings-repository/src/git/GitRepositoryManager.kt
index 7591ba1fa447..42cc586b6ce2 100644
--- a/plugins/settings-repository/src/git/GitRepositoryManager.kt
+++ b/plugins/settings-repository/src/git/GitRepositoryManager.kt
@@ -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