From cd8135951853a60cb46390918539ab461a4305cc Mon Sep 17 00:00:00 2001 From: Ivan Semenov Date: Tue, 2 Oct 2018 17:42:25 +0300 Subject: [PATCH] [github] Always fetch PR branch --- .../github/pullrequest/data/GithubPullRequestsDataLoader.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/GithubPullRequestsDataLoader.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/GithubPullRequestsDataLoader.kt index 9e130014ebf8..52d09bc26d09 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/GithubPullRequestsDataLoader.kt +++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/GithubPullRequestsDataLoader.kt @@ -86,9 +86,8 @@ class GithubPullRequestsDataLoader(private val project: Project, runPartialTask(branchFetchRequest, indicator) { val details = getOrHandle(detailsRequest) - if (!isCommitFetched(details.head.sha)) { - git.fetch(repository, remote, emptyList(), "refs/pull/${details.number}/head:").throwOnError() - } + git.fetch(repository, remote, emptyList(), "refs/pull/${details.number}/head:").throwOnError() + if (!isCommitFetched(details.base.sha)) throw IllegalStateException("Pull request base is not available after fetch") if (!isCommitFetched(details.head.sha)) throw IllegalStateException("Pull request head is not available after fetch") Couple.of(details.base.sha, details.head.sha) }