diff options
| -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 |