Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-08 06:25:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ignore Exception instead of TransportException

Browse Source
This commit is contained in:
takezoe
2013-11-25 18:21:59 +09:00
parent 5790d246c8
commit 7f4def6b83
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/scala/app/PullRequestsController.scala
View File

@@ -18,7 +18,6 @@ import util.JGitUtil.CommitInfo
import org.slf4j.LoggerFactory import org.slf4j.LoggerFactory
import org.eclipse.jgit.merge.MergeStrategy import org.eclipse.jgit.merge.MergeStrategy
import org.eclipse.jgit.errors.NoMergeBaseException import org.eclipse.jgit.errors.NoMergeBaseException
import org.eclipse.jgit.api.errors.TransportException
class PullRequestsController extends PullRequestsControllerBase class PullRequestsController extends PullRequestsControllerBase
with RepositoryService with AccountService with IssuesService with PullRequestService with MilestonesService with ActivityService with RepositoryService with AccountService with IssuesService with PullRequestService with MilestonesService with ActivityService
@@ -457,7 +456,7 @@ trait PullRequestsControllerBase extends ControllerBase {
.setRefSpecs(new RefSpec(s"refs/heads/${requestBranch}:refs/pull/${issueId}/head").setForceUpdate(true)) .setRefSpecs(new RefSpec(s"refs/heads/${requestBranch}:refs/pull/${issueId}/head").setForceUpdate(true))
.call .call
} catch { } catch {
case ex: TransportException => // ignore case ex: Exception => // ignore
} }
git.getRepository.resolve(s"refs/pull/${issueId}/head").getName git.getRepository.resolve(s"refs/pull/${issueId}/head").getName
} }