jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: fail on surprise error in pre-commit hook ......................................................................
Hygiene: fail on surprise error in pre-commit hook replace manual `|| exit 1` with the standard `set -euo pipefail` setting which also guards against unexpected errors Change-Id: Ib9dd8245d5efca75275d219d30598e79eb735e1e --- M dev-scripts/pre-commit 1 file changed, 6 insertions(+), 8 deletions(-) Approvals: Jdlrobson: Looks good to me, approved jenkins-bot: Verified diff --git a/dev-scripts/pre-commit b/dev-scripts/pre-commit index 733afc9..d0d8f5f 100755 --- a/dev-scripts/pre-commit +++ b/dev-scripts/pre-commit @@ -1,21 +1,19 @@ #!/usr/bin/env bash # Enable this pre-commit hook by running 'make installhooks' +set -euo pipefail # check for trailing whitespace -if [[ `git diff --cached --check` ]]; then - git diff --cached --check - exit 1 -fi +git diff --cached --check -make jshint || exit 1 -make jscs || exit 1 +make jshint +make jscs if git diff --name-only --cached | grep --regexp '\.js$' ; then - make qunit || exit 1 + make qunit fi if git diff --name-only --cached | grep --regexp '\.*php$' ; then - make phplint || exit 1 + make phplint fi if git diff --name-only --cached | grep --regexp 'includes/skins/.*php$' ; then -- To view, visit https://gerrit.wikimedia.org/r/305756 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib9dd8245d5efca75275d219d30598e79eb735e1e Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org> Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org> Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
