diff options
| author | 2021-05-24 13:43:35 -0700 | |
|---|---|---|
| committer | 2021-05-26 09:17:27 -0700 | |
| commit | f3d78421ba45ad5661f073795b3dc57411c2f09b (patch) | |
| tree | 354969dacbd122c2d9526c3468010ddcc4e12b96 | |
| parent | 766605521e19917ce305f29429dee99b0955e7dd (diff) | |
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
Merged-In: I18231b93d7f213c13ace0a0af24bb20a394cc50f
Test: Manual testing with various commit messages
| -rwxr-xr-x | tools/aosp/aosp_sha.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/aosp/aosp_sha.sh b/tools/aosp/aosp_sha.sh index 514f17a042bc..3960856f0cf7 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. |