Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-05-06 23:47:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1547 from tkgdsg/archive_root_dir

Browse Source 
root dir in archive file
This commit is contained in:
Naoki Takezoe
2017-04-20 11:20:59 +09:00
committed by GitHub
parent 8aaba606bc 37303a8c5a
commit 95b1945bc1
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -675,8 +675,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
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
val repositorySuffix = (if(sha1.startsWith(revision)) sha1 else revision).replace('/','-')
val filename = repository.name + "-" + repositorySuffix + suffix
contentType = "application/octet-stream"
response.setHeader("Content-Disposition", s"attachment; filename=${filename}")
@@ -684,6 +684,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
git.archive
.setFormat(suffix.tail)
.setPrefix(repository.name + "-" + repositorySuffix + "/")
.setTree(revCommit)
.setOutputStream(response.getOutputStream)
.call()