summaryrefslogtreecommitdiff
path: root/go/cmd
diff options
context:
space:
mode:
authorKim "BKC" Carlbäcker <kim.carlbacker@gmail.com>2017-06-26 17:36:15 +0200
committerKim "BKC" Carlbäcker <kim.carlbacker@gmail.com>2017-07-03 19:12:05 +0200
commit799417a3f59b5b6e2923016c6fa3ecf1f84851bb (patch)
tree3c703ebd078f4bd6be231ccacd6ebb7452f79d07 /go/cmd
parent4539a066ecd2c5a16cab66f9e85f8f0ab747fc5f (diff)
downloadgitlab-shell-799417a3f59b5b6e2923016c6fa3ecf1f84851bb.tar.gz
- Update gitaly vendoring
- Wire up gitaly-*-pack to Gitaly. Don't pass git-*-pack to go - Disable tests for go1.5 & 1.6
Diffstat (limited to 'go/cmd')
-rw-r--r--go/cmd/gitaly-receive-pack/main.go4
-rw-r--r--go/cmd/gitaly-upload-pack/main.go4
2 files changed, 6 insertions, 2 deletions
diff --git a/go/cmd/gitaly-receive-pack/main.go b/go/cmd/gitaly-receive-pack/main.go
index 9e04347..511d584 100644
--- a/go/cmd/gitaly-receive-pack/main.go
+++ b/go/cmd/gitaly-receive-pack/main.go
@@ -29,7 +29,9 @@ func main() {
logger.Fatal("unmarshaling request json failed", err)
}
- if err := handler.ReceivePack(os.Args[1], &request); err != nil {
+ code, err := handler.ReceivePack(os.Args[1], &request)
+ if err != nil {
logger.Fatal("receive-pack failed", err)
}
+ os.Exit(int(code))
}
diff --git a/go/cmd/gitaly-upload-pack/main.go b/go/cmd/gitaly-upload-pack/main.go
index 028c623..282c90f 100644
--- a/go/cmd/gitaly-upload-pack/main.go
+++ b/go/cmd/gitaly-upload-pack/main.go
@@ -29,7 +29,9 @@ func main() {
logger.Fatal("unmarshaling request json failed", err)
}
- if err := handler.UploadPack(os.Args[1], &request); err != nil {
+ code, err := handler.UploadPack(os.Args[1], &request)
+ if err != nil {
logger.Fatal("upload-pack failed", err)
}
+ os.Exit(int(code))
}