diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-03-06 14:15:16 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-03-06 14:15:16 +0000 |
| commit | db6056410480fb9b3e1e336abdaa785cc2d46dcf (patch) | |
| tree | c6335304fbfca19d5bb783aa7ed0ffbf45a5671a | |
| parent | 379ec7d120187c0cdf4aa302c53be6b8e2a3bac0 (diff) | |
| parent | 527f8972a5737545d4c33decce86f33531bffacd (diff) | |
| download | gitlab-shell-db6056410480fb9b3e1e336abdaa785cc2d46dcf.tar.gz | |
Merge branch 'fix-json-unmarshal' into 'master'
Fix unmarshalling JSON from the command line
See merge request gitlab-org/gitlab-shell!280
| -rw-r--r-- | go/cmd/gitaly-receive-pack/main.go | 2 | ||||
| -rw-r--r-- | go/cmd/gitaly-upload-archive/main.go | 2 | ||||
| -rw-r--r-- | go/cmd/gitaly-upload-pack/main.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/go/cmd/gitaly-receive-pack/main.go b/go/cmd/gitaly-receive-pack/main.go index 85decd9..82d191c 100644 --- a/go/cmd/gitaly-receive-pack/main.go +++ b/go/cmd/gitaly-receive-pack/main.go @@ -28,7 +28,7 @@ func main() { func deserialize(requestJSON string) (*pb.SSHReceivePackRequest, error) { var request pb.SSHReceivePackRequest - if err := json.Unmarshal([]byte(requestJSON), request); err != nil { + if err := json.Unmarshal([]byte(requestJSON), &request); err != nil { return nil, err } return &request, nil diff --git a/go/cmd/gitaly-upload-archive/main.go b/go/cmd/gitaly-upload-archive/main.go index fb07613..4037cd0 100644 --- a/go/cmd/gitaly-upload-archive/main.go +++ b/go/cmd/gitaly-upload-archive/main.go @@ -28,7 +28,7 @@ func main() { func deserialize(argumentJSON string) (*pb.SSHUploadArchiveRequest, error) { var request pb.SSHUploadArchiveRequest - if err := json.Unmarshal([]byte(argumentJSON), request); err != nil { + if err := json.Unmarshal([]byte(argumentJSON), &request); err != nil { return nil, err } return &request, nil diff --git a/go/cmd/gitaly-upload-pack/main.go b/go/cmd/gitaly-upload-pack/main.go index 3fb721d..766f0c5 100644 --- a/go/cmd/gitaly-upload-pack/main.go +++ b/go/cmd/gitaly-upload-pack/main.go @@ -28,7 +28,7 @@ func main() { func deserialize(requestJSON string) (*pb.SSHUploadPackRequest, error) { var request pb.SSHUploadPackRequest - if err := json.Unmarshal([]byte(requestJSON), request); err != nil { + if err := json.Unmarshal([]byte(requestJSON), &request); err != nil { return nil, err } return &request, nil |