Fix leftovers after middleware concept merge.

archive.go

@@ -16,7 +16,7 @@ import (
 	"time"
 )
 
-func handleGetArchive(w http.ResponseWriter, r *gitRequest, format string) (callback *gitRequest) {
+func handleGetArchive(w http.ResponseWriter, r *gitRequest, format string) {
 	archiveFilename := path.Base(r.ArchivePath)
 
 	if cachedArchive, err := os.Open(r.ArchivePath); err == nil {

git-http.go

@@ -12,7 +12,7 @@ import (
 	"strings"
 )
 
-func handleGetInfoRefs(w http.ResponseWriter, r *gitRequest, _ string) (callback *gitRequest) {
+func handleGetInfoRefs(w http.ResponseWriter, r *gitRequest, _ string) {
 	rpc := r.URL.Query().Get("service")
 	if !(rpc == "git-upload-pack" || rpc == "git-receive-pack") {
 		// The 'dumb' Git HTTP protocol is not supported
@@ -58,7 +58,7 @@ func handleGetInfoRefs(w http.ResponseWriter, r *gitRequest, _ string) (callback
 	return
 }
 
-func handlePostRPC(w http.ResponseWriter, r *gitRequest, rpc string) (callback *gitRequest) {
+func handlePostRPC(w http.ResponseWriter, r *gitRequest, rpc string) {
 	var body io.ReadCloser
 	var err error
 

lfs.go

@@ -23,7 +23,7 @@ var (
 	errSizeMismatch = errors.New("Content size does not match")
 )
 
-func handleStoreLfsObject(w http.ResponseWriter, r *gitRequest, rpc string) (callback *gitRequest) {
+func handleStoreLfsObject(w http.ResponseWriter, r *gitRequest, rpc string) {
 	var body io.ReadCloser
 
 	urlPath := r.URL.Path
@@ -42,9 +42,9 @@ func handleStoreLfsObject(w http.ResponseWriter, r *gitRequest, rpc string) (cal
 	storePath := filepath.Join(r.StoreLFSPath, transformKey(oid))
 
 	if _, err := os.Stat(storePath); os.IsNotExist(err) {
-		var err error
 		tmpPath := filepath.Join(r.StoreLFSPath, "tmp", oid)
 
+		if _, err := os.Stat(tmpPath); os.IsNotExist(err) {
 			// TODO try removing gzip, possibly not needed
 			// The client request body may have been gzipped.
 			if r.Header.Get("Content-Encoding") == "gzip" {
@@ -101,6 +101,7 @@ func handleStoreLfsObject(w http.ResponseWriter, r *gitRequest, rpc string) (cal
 				return
 			}
 		}
+	}
 	// if err := os.Rename(tmpPath, path); err != nil {
 	// 	fail500(w, "Failed to rename temporary LFS object.", err)
 	// 	return
@@ -108,11 +109,11 @@ func handleStoreLfsObject(w http.ResponseWriter, r *gitRequest, rpc string) (cal
 
 	log.Printf("Received the LFS object from client, oid: %s", oid)
 
-	return r
+	return
 
 }
 
-func handleRetreiveLfsObject(w http.ResponseWriter, r *gitRequest, rpc string) (callback *gitRequest) {
+func handleRetreiveLfsObject(w http.ResponseWriter, r *gitRequest, rpc string) {
 	log.Printf("I should download %s", r)
 
 	urlPath := r.URL.Path

upstream.go

@@ -179,4 +179,3 @@ func looksLikeRepo(p string) bool {
 	}
 	return true
 }
-