exec: the two smart-HTTP spawns the sweep missed !257
1 file changed, +3 −2
Layout: unified · split
internal/httpd/smart.go +3 −2
| @@ -18,6 +18,7 @@ import ( | |||
| 18 | "gitbay.org/gitbay/internal/config" | 18 | "gitbay.org/gitbay/internal/config" |
| 19 | "gitbay.org/gitbay/internal/control" | 19 | "gitbay.org/gitbay/internal/control" |
| 20 | "gitbay.org/gitbay/internal/store" | 20 | "gitbay.org/gitbay/internal/store" |
| 21 | "gitbay.org/gitbay/internal/toolpath" | ||
| 21 | ) | 22 | ) |
| 22 | 23 | ||
| 23 | type Server struct { | 24 | type Server struct { |
| @@ -74,7 +75,7 @@ func (s *Server) infoRefs(w http.ResponseWriter, r *http.Request) { | |||
| 74 | pktLine(w, "# service=git-upload-pack\n") | 75 | pktLine(w, "# service=git-upload-pack\n") |
| 75 | pktFlush(w) | 76 | pktFlush(w) |
| 76 | dir := control.RepoDir(s.cfg.Server.Root, repo.OwnerName, repo.Name) | 77 | dir := control.RepoDir(s.cfg.Server.Root, repo.OwnerName, repo.Name) |
| 77 | cmd := exec.CommandContext(r.Context(), "git", "upload-pack", "--stateless-rpc", "--advertise-refs", dir) | 78 | cmd := exec.CommandContext(r.Context(), toolpath.Look("git"), "upload-pack", "--stateless-rpc", "--advertise-refs", dir) |
| 78 | cmd.Env = append(os.Environ(), gitProtocolEnv(r)...) | 79 | cmd.Env = append(os.Environ(), gitProtocolEnv(r)...) |
| 79 | cmd.Stdout = w | 80 | cmd.Stdout = w |
| 80 | cmd.Run() | 81 | cmd.Run() |
| @@ -112,7 +113,7 @@ func (s *Server) uploadPack(w http.ResponseWriter, r *http.Request) { | |||
| 112 | w.Header().Set("Content-Type", "application/x-git-upload-pack-result") | 113 | w.Header().Set("Content-Type", "application/x-git-upload-pack-result") |
| 113 | w.Header().Set("Cache-Control", "no-cache") | 114 | w.Header().Set("Cache-Control", "no-cache") |
| 114 | dir := control.RepoDir(s.cfg.Server.Root, repo.OwnerName, repo.Name) | 115 | dir := control.RepoDir(s.cfg.Server.Root, repo.OwnerName, repo.Name) |
| 115 | cmd := exec.CommandContext(r.Context(), "git", "upload-pack", "--stateless-rpc", dir) | 116 | cmd := exec.CommandContext(r.Context(), toolpath.Look("git"), "upload-pack", "--stateless-rpc", dir) |
| 116 | cmd.Env = append(os.Environ(), gitProtocolEnv(r)...) | 117 | cmd.Env = append(os.Environ(), gitProtocolEnv(r)...) |
| 117 | cmd.Stdin = body | 118 | cmd.Stdin = body |
| 118 | cmd.Stdout = w | 119 | cmd.Stdout = w |