Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae3c5c80 authored by Vince Harron's avatar Vince Harron Committed by Automerger Merge Worker
Browse files

Merge "BSD grep doesn't support -P" am: 3ad0c611 am: 6e008cbb am: 39465971 

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

Change-Id: I4af27181e9739553d5395eddac05f96038d7e634
parents 289974b1 39465971

tools/aosp/aosp_sha.sh

+1 −1
Original line number Diff line number Diff line 
#!/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