diff options
| author | John Cai <jcai@gitlab.com> | 2022-06-21 17:50:19 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2022-06-21 17:50:19 +0300 |
| commit | 4c37bb3678420b9c1422c438b387500b51ab0856 (patch) | |
| tree | 2b588e3382393c244bed21efe9dbf24f46a6d35c | |
| parent | 2e1956d310651c98b881eb49cb0d5e953e7cafe7 (diff) | |
| parent | 227a594d2128d80f4239fea952e33eb372740782 (diff) | |
Merge branch 'fix_receive_hooks_payload_nil' into 'master'
Ensure there is a receive hooks payload before using it
See merge request gitlab-org/gitaly!4655
| -rw-r--r-- | cmd/gitaly-hooks/hooks.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/gitaly-hooks/hooks.go b/cmd/gitaly-hooks/hooks.go index 10a0d2514..35248e143 100644 --- a/cmd/gitaly-hooks/hooks.go +++ b/cmd/gitaly-hooks/hooks.go @@ -399,7 +399,7 @@ func handlePackObjectsWithSidechannel(ctx context.Context, payload git.HooksPayl glID = payload.UserDetails.UserID glUsername = payload.UserDetails.Username gitProtocol = payload.UserDetails.Protocol - } else { + } else if payload.ReceiveHooksPayload != nil { glID = payload.ReceiveHooksPayload.UserID glUsername = payload.ReceiveHooksPayload.Username gitProtocol = payload.ReceiveHooksPayload.Protocol |