Commit 3906e86e40b6e7482e53abdcca652b31a4c1d18d

Add back the prefix arg for git-archive

Commit diff


87	87	@commit = @git.commit(params[:sha])
88	88
89	89	if @commit
90		~~data = @git.archive_tar_gz(params[:sha])~~
	90	prefix = "#{@project.slug}-#{@repository.name}"
	91	data = @git.archive_tar_gz(params[:sha], prefix + "/")
91	92
92	93	send_data(data, :type => 'application/x-gzip',
93		~~:filename => "#{@project.slug}-#{@repository.name}.tar.gz")~~
	94	:filename => "#{prefix}.tar.gz")
94	95	else
95	96	flash[:error] = "The given repository or sha is invalid"
96	97	redirect_to project_repository_path(@project, @repository) and return
toggle raw diff
--- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -87,10 +87,11 @@ class BrowseController < ApplicationController @commit = @git.commit(params[:sha]) if @commit - data = @git.archive_tar_gz(params[:sha]) + prefix = "#{@project.slug}-#{@repository.name}" + data = @git.archive_tar_gz(params[:sha], prefix + "/") send_data(data, :type => 'application/x-gzip', - :filename => "#{@project.slug}-#{@repository.name}.tar.gz") + :filename => "#{prefix}.tar.gz") else flash[:error] = "The given repository or sha is invalid" redirect_to project_repository_path(@project, @repository) and return