Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-12-30 12:19:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1537 from tkgdsg/archivefile_naming_rule_when_sha1

Browse Source 
To have compatibility with GitHub/GitHubEnterprise
This commit is contained in:
Naoki Takezoe
2017-04-16 14:53:22 +09:00
committed by GitHub
parent d662df5a7d c0320d3139
commit e7b368ced2
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
View File

@@ -670,12 +670,13 @@ trait RepositoryViewerControllerBase extends ControllerBase {
private def archiveRepository(name: String, suffix: String, repository: RepositoryService.RepositoryInfo): Unit = {
val revision = name.stripSuffix(suffix)
val filename = repository.name + "-" +
(if(revision.length == 40) revision.substring(0, 10) else revision).replace('/', '-') + suffix
using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision))
val oid = git.getRepository.resolve(revision)
val revCommit = JGitUtil.getRevCommitFromId(git, oid)
val sha1 = oid.getName()
val filename = repository.name + "-" +
(if(sha1.startsWith(revision)) sha1 else revision).replace('/','-') + suffix
contentType = "application/octet-stream"
response.setHeader("Content-Disposition", s"attachment; filename=${filename}")