Merge pull request #132 from osowskit/master

Tom Osowski · web-flow · commit 93a65f798b91 · 2017-03-24T20:29:40.000-07:00
Minor fixes to block self merge hook
diff --git a/pre-receive-hooks/block_self_merge_prs.sh b/pre-receive-hooks/block_self_merge_prs.sh
@@ -8,7 +8,7 @@
 # https://help.github.com/enterprise/admin/guides/developer-workflow/managing-pre-receive-hooks-on-the-github-enterprise-appliance/
 #
 
-if [[ "$GITHUB_VIA" = "merge api" ]] && [[ "$GITHUB_PULL_REQUEST_AUTHOR_LOGIN" = "$GITHUB_USER_LOGIN" ]]; then
+if [[ "$GITHUB_VIA" = *"merge"* ]] && [[ "$GITHUB_PULL_REQUEST_AUTHOR_LOGIN" = "$GITHUB_USER_LOGIN" ]]; then
     echo "Blocking merging of your own pull request."
     exit 1
 fi

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`# https://help.github.com/enterprise/admin/guides/developer-workflow/managing-pre-receive-hooks-on-the-github-enterprise-appliance/`
`9`	`9`	`#`
`10`	`10`
`11`		`-if [[ "$GITHUB_VIA" = "merge api" ]] && [[ "$GITHUB_PULL_REQUEST_AUTHOR_LOGIN" = "$GITHUB_USER_LOGIN" ]]; then`
	`11`	`+if [[ "$GITHUB_VIA" = "merge" ]] && [[ "$GITHUB_PULL_REQUEST_AUTHOR_LOGIN" = "$GITHUB_USER_LOGIN" ]]; then`
`12`	`12`	`echo "Blocking merging of your own pull request."`
`13`	`13`	`exit 1`
`14`	`14`	`fi`