From 627b9ca3b706d6205216fd7e3726cbed45300a1a Mon Sep 17 00:00:00 2001 From: Seth Moore Date: Mon, 24 May 2021 13:43:35 -0700 Subject: Check for Ignore-AOSP-First commit tag If the Ignore-AOSP-First tag is in a commit message, it means the committer is intentionally bypassing the AOSP source of truth. Check for this tag in the AOSP-first presubmit hook so that devs don't have to turn off hooks to get past the AOSP-first policy in exceptional cases. Bug: 189139990 Change-Id: I18231b93d7f213c13ace0a0af24bb20a394cc50f Test: Manual testing with various commit messages --- tools/aosp/aosp_sha.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/aosp/aosp_sha.sh b/tools/aosp/aosp_sha.sh index 99aaa3c4d6e5..81d35efaf29f 100755 --- a/tools/aosp/aosp_sha.sh +++ b/tools/aosp/aosp_sha.sh @@ -4,6 +4,9 @@ LOCAL_DIR="$( dirname "${BASH_SOURCE}" )" if git branch -vv | grep -q -P "^\*[^\[]+\[aosp/"; then # Change appears to be in AOSP exit 0 +elif git log -n 1 --format='%B' $1 | grep -q -E "^Ignore-AOSP-First: .+" ; then + # Change is explicitly marked as ok to skip AOSP + exit 0 else # Change appears to be non-AOSP; search for files count=0 -- cgit v1.2.3-59-g8ed1b