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

Commit 17ac2e2d 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 

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

Change-Id: I68e1421057a3dea0aa51bdc62059c3476c0d7637
parents e1e07765 0b0c098d

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