Commit a859867a authored by Patrick Bajao's avatar Patrick Bajao

Remove unneeded call for helper.Fail500

parent 5273f2ca
...@@ -104,7 +104,7 @@ func (a *archive) Inject(w http.ResponseWriter, r *http.Request, sendData string ...@@ -104,7 +104,7 @@ func (a *archive) Inject(w http.ResponseWriter, r *http.Request, sendData string
var archiveReader io.Reader var archiveReader io.Reader
archiveReader, err = handleArchiveWithGitaly(w, r, params, format) archiveReader, err = handleArchiveWithGitaly(r, params, format)
if err != nil { if err != nil {
helper.Fail500(w, r, fmt.Errorf("operations.GetArchive: %v", err)) helper.Fail500(w, r, fmt.Errorf("operations.GetArchive: %v", err))
return return
...@@ -132,7 +132,7 @@ func (a *archive) Inject(w http.ResponseWriter, r *http.Request, sendData string ...@@ -132,7 +132,7 @@ func (a *archive) Inject(w http.ResponseWriter, r *http.Request, sendData string
} }
} }
func handleArchiveWithGitaly(w http.ResponseWriter, r *http.Request, params archiveParams, format gitalypb.GetArchiveRequest_Format) (io.Reader, error) { func handleArchiveWithGitaly(r *http.Request, params archiveParams, format gitalypb.GetArchiveRequest_Format) (io.Reader, error) {
var request *gitalypb.GetArchiveRequest var request *gitalypb.GetArchiveRequest
c, err := gitaly.NewRepositoryClient(params.GitalyServer) c, err := gitaly.NewRepositoryClient(params.GitalyServer)
if err != nil { if err != nil {
...@@ -143,8 +143,7 @@ func handleArchiveWithGitaly(w http.ResponseWriter, r *http.Request, params arch ...@@ -143,8 +143,7 @@ func handleArchiveWithGitaly(w http.ResponseWriter, r *http.Request, params arch
request = &gitalypb.GetArchiveRequest{} request = &gitalypb.GetArchiveRequest{}
if err := proto.Unmarshal(params.GetArchiveRequest, request); err != nil { if err := proto.Unmarshal(params.GetArchiveRequest, request); err != nil {
helper.Fail500(w, r, fmt.Errorf("SendArchive: unmarshal GetArchiveRequest: %v", err)) return nil, fmt.Errorf("unmarshal GetArchiveRequest: %v", err)
return nil, err
} }
} else { } else {
request = &gitalypb.GetArchiveRequest{ request = &gitalypb.GetArchiveRequest{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment