diff options
| author | Seth Moore <sethmo@google.com> | 2021-05-26 16:02:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-05-26 16:02:06 +0000 |
| commit | a63e111574f9348150d4a150cf2cc2923fdcb7d2 (patch) | |
| tree | cf4a6e0be04aa62aeccb21d7dc083e67db2a29f2 | |
| parent | b8945154d0d1927853c98b5817f69e113bf8f5c8 (diff) | |
| parent | 627b9ca3b706d6205216fd7e3726cbed45300a1a (diff) | |
Merge "Check for Ignore-AOSP-First commit tag" into sc-dev
| -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 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 |