3 files changed, 95 insertions, 6 deletions

diff --git a/cmd/gitaly-hooks/hooks.go b/cmd/gitaly-hooks/hooks.go
index d94ecba05..70ea5d83e 100644
--- a/cmd/gitaly-hooks/hooks.go
+++ b/cmd/gitaly-hooks/hooks.go
@@ -25,25 +25,31 @@ import (
 )
 
 type hookCommand struct {
-	exec func(context.Context, git.HooksPayload, gitalypb.HookServiceClient, []string) (int, error)
+	exec     func(context.Context, git.HooksPayload, gitalypb.HookServiceClient, []string) (int, error)
+	hookType git.Hook
 }
 
 var (
 	hooksBySubcommand = map[string]hookCommand{
 		"update": hookCommand{
-			exec: updateHook,
+			exec:     updateHook,
+			hookType: git.UpdateHook,
 		},
 		"pre-receive": hookCommand{
-			exec: preReceiveHook,
+			exec:     preReceiveHook,
+			hookType: git.PreReceiveHook,
 		},
 		"post-receive": hookCommand{
-			exec: postReceiveHook,
+			exec:     postReceiveHook,
+			hookType: git.PostReceiveHook,
 		},
 		"reference-transaction": hookCommand{
-			exec: referenceTransactionHook,
+			exec:     referenceTransactionHook,
+			hookType: git.ReferenceTransactionHook,
 		},
 		"git": hookCommand{
-			exec: packObjectsHook,
+			exec:     packObjectsHook,
+			hookType: git.PackObjectsHook,
 		},
 	}
 
@@ -102,6 +108,12 @@ func main() {
 		logger.Fatalf("subcommand name invalid: %q", subCmd)
 	}
 
+	// If the hook wasn't requested, then we simply skip executing any
+	// logic.
+	if !payload.IsHookRequested(hookCommand.hookType) {
+		os.Exit(0)
+	}
+
 	conn, err := dialGitaly(payload)
 	if err != nil {
 		logger.Fatalf("error when connecting to gitaly: %v", err)
diff --git a/internal/git/hooks_payload.go b/internal/git/hooks_payload.go
index 1d41631c1..7fd9d9ade 100644
--- a/internal/git/hooks_payload.go
+++ b/internal/git/hooks_payload.go
@@ -206,3 +206,9 @@ func (p HooksPayload) Env() (string, error) {
 
 	return fmt.Sprintf("%s=%s", EnvHooksPayload, encoded), nil
 }
+
+// IsHookRequested returns whether the HooksPayload is requesting execution of
+// the given git hook.
+func (p HooksPayload) IsHookRequested(hook Hook) bool {
+	return p.RequestedHooks&hook != 0
+}
diff --git a/internal/git/hooks_payload_test.go b/internal/git/hooks_payload_test.go
index cae96caf1..8df82cebf 100644
--- a/internal/git/hooks_payload_test.go
+++ b/internal/git/hooks_payload_test.go
@@ -145,3 +145,74 @@ func TestHooksPayload(t *testing.T) {
 		}, payload)
 	})
 }
+
+func TestHooksPayload_IsHookRequested(t *testing.T) {
+	for _, tc := range []struct {
+		desc       string
+		configured Hook
+		request    Hook
+		expected   bool
+	}{
+		{
+			desc:       "exact match",
+			configured: PreReceiveHook,
+			request:    PreReceiveHook,
+			expected:   true,
+		},
+		{
+			desc:       "hook matches a set",
+			configured: PreReceiveHook | PostReceiveHook,
+			request:    PreReceiveHook,
+			expected:   true,
+		},
+		{
+			desc:       "no match",
+			configured: PreReceiveHook,
+			request:    PostReceiveHook,
+			expected:   false,
+		},
+		{
+			desc:       "no match with a set",
+			configured: PreReceiveHook | UpdateHook,
+			request:    PostReceiveHook,
+			expected:   false,
+		},
+		{
+			desc:       "no match with nothing set",
+			configured: 0,
+			request:    PostReceiveHook,
+			expected:   false,
+		},
+		{
+			desc:       "pre-receive hook with AllHooks",
+			configured: AllHooks,
+			request:    PreReceiveHook,
+			expected:   true,
+		},
+		{
+			desc:       "post-receive hook with AllHooks",
+			configured: AllHooks,
+			request:    PostReceiveHook,
+			expected:   true,
+		},
+		{
+			desc:       "update hook with AllHooks",
+			configured: AllHooks,
+			request:    UpdateHook,
+			expected:   true,
+		},
+		{
+			desc:       "reference-transaction hook with AllHooks",
+			configured: AllHooks,
+			request:    ReferenceTransactionHook,
+			expected:   true,
+		},
+	} {
+		t.Run(tc.desc, func(t *testing.T) {
+			actual := HooksPayload{
+				RequestedHooks: tc.configured,
+			}.IsHookRequested(tc.request)
+			require.Equal(t, tc.expected, actual)
+		})
+	}
+}