Merge "BSD grep doesn't support -P" am: 3ad0c61146 am: 6e008cbb2a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891500

Change-Id: Ifae93b7302a5b2d743a4c996c91586da6f23e24e
This commit is contained in:
Vince Harron
2021-11-18 22:04:40 +00:00
committed by Automerger Merge Worker

View File

@@ -1,7 +1,7 @@
#!/bin/bash
LOCAL_DIR="$( dirname "${BASH_SOURCE}" )"
if git branch -vv | grep -q -P "^\*[^\[]+\[aosp/"; then
if git branch -vv | grep -q -E "^\*[^\[]+\[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