From b3a17c77bef7b6113d724225a06e53301e12902c Mon Sep 17 00:00:00 2001 From: Vince Harron Date: Fri, 12 Nov 2021 18:28:01 -0800 Subject: [PATCH] BSD grep doesn't support -P Test: New grep command tested on Linux and macOS Bug: b/206150971 Change-Id: I9f1684298672fee1561166a03392bd07be8c5cd6 --- tools/aosp/aosp_sha.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/aosp/aosp_sha.sh b/tools/aosp/aosp_sha.sh index ac23c3d9cb4a0..36bea57b710fd 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