Merge "BSD grep doesn't support -P" am: 3ad0c61146 am: 6e008cbb2a am: 39465971f4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891500 Change-Id: I4af27181e9739553d5395eddac05f96038d7e634
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user