Merge "Improve how "likely an AOSP change" is detected"

This commit is contained in:
Anton Hansson
2022-01-14 16:24:07 +00:00
committed by Gerrit Code Review

View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
LOCAL_DIR="$( dirname "${BASH_SOURCE}" )" LOCAL_DIR="$( dirname "${BASH_SOURCE}" )"
if git branch -vv | grep -q -E "^\*[^\[]+\[aosp/"; then if git log -n 1 --format='%D' HEAD@{upstream} | grep -q aosp/; then
# Change appears to be in AOSP # Change appears to be in AOSP
exit 0 exit 0
elif git log -n 1 --format='%B' $1 | grep -q -E "^Ignore-AOSP-First: .+" ; then elif git log -n 1 --format='%B' $1 | grep -q -E "^Ignore-AOSP-First: .+" ; then