From 441c8daa014bb7d76c6396365ae817fb562ee3ac Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 12 Aug 2016 16:11:22 +0200
Subject: [PATCH] ics: do not fetch twice

---
 .../settings-repository/src/git/GitRepositoryManager.kt   | 8 +++-----
 plugins/settings-repository/src/git/pull.kt               | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/plugins/settings-repository/src/git/GitRepositoryManager.kt b/plugins/settings-repository/src/git/GitRepositoryManager.kt
index e57b6ae04b45..ed5530c8c530 100644
--- a/plugins/settings-repository/src/git/GitRepositoryManager.kt
+++ b/plugins/settings-repository/src/git/GitRepositoryManager.kt
@@ -216,13 +216,11 @@ class GitRepositoryManager(private val credentialsStore: NotNullLazyValue<Creden
       // KT-8632
       override fun merge(): UpdateResult? = lock.write {
         val committed = commit(pullTask.indicator)
-        if (refToMerge == null && !committed && getAheadCommitsCount() == 0) {
-          definitelySkipPush = true
+        if (refToMerge == null) {
+          definitelySkipPush = !committed && getAheadCommitsCount() == 0
           return null
         }
-        else {
-          return pullTask.pull(prefetchedRefToMerge = refToMerge)
-        }
+        return pullTask.pull(prefetchedRefToMerge = refToMerge)
       }
     }
   }
diff --git a/plugins/settings-repository/src/git/pull.kt b/plugins/settings-repository/src/git/pull.kt
index 6723a9a77dae..80b0e2059930 100644
--- a/plugins/settings-repository/src/git/pull.kt
+++ b/plugins/settings-repository/src/git/pull.kt
@@ -62,7 +62,7 @@ open internal class Pull(val manager: GitRepositoryManager, val indicator: Progr
       return null
     }
 
-    var refToMerge = prefetchedRefToMerge ?: fetch() ?: return null
+    val refToMerge = prefetchedRefToMerge ?: fetch() ?: return null
     val mergeResult = merge(refToMerge, mergeStrategy, commitMessage = commitMessage)
     val mergeStatus = mergeResult.status
     LOG.debug { mergeStatus.toString() }