diff options
authorSimon Hausmann <>2019-03-13 16:30:37 +0100
committerSimon Hausmann <>2019-03-15 07:52:05 +0000
commita29ca6139902e0eba6bf5f6b46eb56d54fb59ea0 (patch)
parentf9c6da38f70d9bf95937a5de8269e0f8d52600a4 (diff)
Permit the use of MAC/mac again in commit messages/content
Once in a while somebody runs into the bot complaining about the use of "MAC" when it's perfectly fine. For example in the context of "MAC address". This is quite annoying and less helpful than perhaps intended. So this change removes the trigger-happy part of the check but keeps the more clearly defined potential uses of old terminology from Apple. Fixes: QTQAINFRA-2800 Change-Id: If6b9cfbd0a808b424ffc93728fcc66939f5ad6ee Reviewed-by: Paul Wicking <> Reviewed-by: Edward Welbourne <>
1 files changed, 1 insertions, 1 deletions
diff --git a/git-hooks/sanitize-commit b/git-hooks/sanitize-commit
index 515e49b..4d5d0da 100755
--- a/git-hooks/sanitize-commit
+++ b/git-hooks/sanitize-commit
@@ -289,7 +289,7 @@ sub check_apple_terminology()
- if (/\bMacOS\b/ or /\bOS[\s]*X\b/ or /\bmac(([\s_-]*os)([\s_-]*x))?\b/i or /\bmacintosh\b/i) {
+ if (/\bMacOS\b/ or /\bOS[\s]*X\b/ or /\bmacintosh\b/i) {
complain_ln("Possible incorrect use of Apple-related terminology; " .
"the correct name of Apple's desktop operating system is 'macOS'", "", -1);