Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "BSD grep doesn't support -P"

Browse Source
This commit is contained in:
Vince Harron
2021-11-18 21:34:19 +00:00
committed by Gerrit Code Review
parent bd0a86f9d7 b3a17c77be
commit 3ad0c61146
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/aosp/aosp_sha.sh
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 -P "^\*[^\[]+\[aosp/"; then if git branch -vv | grep -q -E "^\*[^\[]+\[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