Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Improve how "likely an AOSP change" is detected" am: 0b0c098d36 am: 17ac2e2d80

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

Change-Id: I564a443788f94a01c452b9a68d0317bd799ca0a9
This commit is contained in:
Anton Hansson
2022-01-14 16:56:44 +00:00
committed by Automerger Merge Worker
parent 6198337c7a 17ac2e2d80
commit 081048aff1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/aosp/aosp_sha.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
LOCAL_DIR="$( dirname "${BASH_SOURCE}" )" 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 # Change appears to be in AOSP
exit 0 exit 0
elif git log -n 1 --format='%B' $1 | grep -q -E "^Ignore-AOSP-First: .+" ; then elif git log -n 1 --format='%B' $1 | grep -q -E "^Ignore-AOSP-First: .+" ; then