diff options
| author | Vince Harron <vharron@google.com> | 2021-11-18 21:34:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-11-18 21:34:19 +0000 |
| commit | 3ad0c61146df875ecee78163c86224993e83eace (patch) | |
| tree | 561fae4a91bcb63e723545559438d13055ec7879 | |
| parent | bd0a86f9d716f5a1d307a9723b2c02ce4101c77f (diff) | |
| parent | b3a17c77bef7b6113d724225a06e53301e12902c (diff) | |
Merge "BSD grep doesn't support -P"
| -rwxr-xr-x | tools/aosp/aosp_sha.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aosp/aosp_sha.sh b/tools/aosp/aosp_sha.sh index ac23c3d9cb4a..36bea57b710f 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 -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 |