Commit 16dc2cea authored by Jacob Vosmaer's avatar Jacob Vosmaer

Fixup merge

parent 51d1256c
...@@ -3,9 +3,9 @@ package git ...@@ -3,9 +3,9 @@ package git
import ( import (
"../helper" "../helper"
"encoding/base64" "encoding/base64"
"log"
"fmt" "fmt"
"io" "io"
"log"
"net/http" "net/http"
) )
...@@ -27,7 +27,7 @@ func SendGitBlob(w http.ResponseWriter, r *http.Request, repoPath string, blobId ...@@ -27,7 +27,7 @@ func SendGitBlob(w http.ResponseWriter, r *http.Request, repoPath string, blobId
helper.Fail500(w, fmt.Errorf("SendGitBlob: start %v: %v", gitShowCmd, err)) helper.Fail500(w, fmt.Errorf("SendGitBlob: start %v: %v", gitShowCmd, err))
return return
} }
defer cleanUpProcessGroup(gitShowCmd) defer helper.CleanUpProcessGroup(gitShowCmd)
if _, err := io.Copy(w, stdout); err != nil { if _, err := io.Copy(w, stdout); err != nil {
helper.LogError(fmt.Errorf("SendGitBlob: copy git show stdout: %v", err)) helper.LogError(fmt.Errorf("SendGitBlob: copy git show stdout: %v", err))
......
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