diff options
| author | 2021-05-26 16:27:41 +0000 | |
|---|---|---|
| committer | 2021-05-26 16:27:41 +0000 | |
| commit | 31c1300fe15a86046bf3e6112e401d98191cd81e (patch) | |
| tree | 54aae6c496080a5c363a4b3d6bea9dccb20c8106 /tools/aosp | |
| parent | 7146bb3dd09164cd04ff1529e60fa9ffe90d965b (diff) | |
| parent | a63e111574f9348150d4a150cf2cc2923fdcb7d2 (diff) | |
Merge "Check for Ignore-AOSP-First commit tag" into sc-dev am: a63e111574
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703967
Change-Id: If7120daa47a8fd6d3b01afa2d7bae9826bf3b1ea
Diffstat (limited to 'tools/aosp')
| -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 5154788fdcb6..3cdb27c74d63 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. |