From 2f51277ebfda930cac17b77df52a0dd2b222500f Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Thu, 13 Jan 2022 15:25:06 +0000 Subject: [PATCH] Improve how "likely an AOSP change" is detected git branch -vv can be incredibly slow (over 5s on my machine/repo), so when aosp_sha.sh is called multiple times per commit, the repo upload hook can take a very long time to run (>2 mins for my stack of changes). The only output used from git branch -vv was the upstream of the current branch, which can be determined in a much faster/simpler way via printing the ref name of @{u} (git lingo for the upstream HEAD). Test: $ { aosp_sha.sh HEAD && echo ok || echo no } in aosp and internal Change-Id: I993496d8ec9e55c13803590bbb6c5d9d49cde158 --- 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 36bea57b710f..95b43cdf253d 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 -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