diff options
author | Lunny Xiao <xiaolunwen@gmail.com> | 2014-04-10 22:21:12 +0800 |
---|---|---|
committer | Lunny Xiao <xiaolunwen@gmail.com> | 2014-04-10 22:21:12 +0800 |
commit | 94c7278194694fec728b518d4390b03ba6c237a4 (patch) | |
tree | 2aebf5fe63423b7b2eb14d58697bab1c95ffb3bb /routers/repo/http.go | |
parent | 16b6e5d50b665c5376b61ca7d02e3716a1c05ead (diff) | |
parent | 2577940c30f6a6d15390974ab36f8c3d1e00f9f4 (diff) | |
download | gitea-94c7278194694fec728b518d4390b03ba6c237a4.tar.gz gitea-94c7278194694fec728b518d4390b03ba6c237a4.zip |
Merge branch 'master' of github.com:gogits/gogs into dev
Conflicts:
web.go
Diffstat (limited to 'routers/repo/http.go')
-rw-r--r-- | routers/repo/http.go | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/routers/repo/http.go b/routers/repo/http.go index d3699f3a24..993de51f93 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -135,10 +135,11 @@ type route struct { } type Config struct { - ReposRoot string - GitBinPath string - UploadPack bool - ReceivePack bool + ReposRoot string + GitBinPath string + UploadPack bool + ReceivePack bool + OnPushSucceed func() } type handler struct { @@ -223,21 +224,26 @@ func serviceRpc(rpc string, hr handler) { in, err := cmd.StdinPipe() if err != nil { log.Print(err) + return } stdout, err := cmd.StdoutPipe() if err != nil { log.Print(err) + return } err = cmd.Start() if err != nil { log.Print(err) + return } in.Write(input) io.Copy(w, stdout) cmd.Wait() + + hr.Config.OnPushSucceed() } func getInfoRefs(hr handler) { |