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

Commit 392bc3d4 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Improve how "likely an AOSP change" is detected" am: 0b0c098d am:... 

Merge "Improve how "likely an AOSP change" is detected" am: 0b0c098d am: 17ac2e2d am: 081048af

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

Change-Id: Ibfc755f0d745ed056eedc36b586ee36b595c077e
parents 33b835cb 081048af

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 -E "^\*[^\[]+\[aosp/"; then

if git log -n 1 --format='%D' HEAD@{upstream} | grep -q 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