| commit | 081048aff1994ff2b5d4a990d6303a0ae57ae5a5 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Fri Jan 14 16:56:44 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 14 16:56:44 2022 +0000 |
| tree | 1cba8c82e3c095cebee84368713543566bc678be | |
| parent | 6198337c7a97dc138aaab06eb8f54f43c0afaa7c [diff] | |
| parent | 17ac2e2d80b2acccb6ee58b63b6f242e48051e1d [diff] |
Merge "Improve how "likely an AOSP change" is detected" am: 0b0c098d36 am: 17ac2e2d80 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1948796 Change-Id: I564a443788f94a01c452b9a68d0317bd799ca0a9
diff --git a/tools/aosp/aosp_sha.sh b/tools/aosp/aosp_sha.sh index 36bea57..95b43cd 100755 --- a/tools/aosp/aosp_sha.sh +++ b/tools/aosp/aosp_sha.sh
@@ -1,7 +1,7 @@ #!/bin/bash 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 exit 0 elif git log -n 1 --format='%B' $1 | grep -q -E "^Ignore-AOSP-First: .+" ; then