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

ics: do not fetch twice

Browse Source
This commit is contained in:
Vladimir Krivosheev
2016-08-12 16:12:11 +02:00
parent a2a5c00b2f
commit 441c8daa01
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/settings-repository/src/git/GitRepositoryManager.kt
+3 -5
View File
@@ -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)
}
}
}
plugins/settings-repository/src/git/pull.kt
+1 -1
View File
@@ -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() }