aosp-merger: Get branch reliably

Change-Id: I6457cd7ab0d444ea22fba6a3ced65ef88e24fa3a
This commit is contained in:
Chirayu Desai
2020-11-04 02:55:18 +05:30
committed by Michael Bestas
parent 550c7d889b
commit f07e1584f7

View File

@@ -46,8 +46,7 @@ fi
TOP="${ANDROID_BUILD_TOP}"
MERGEDREPOS="${TOP}/merged_repos.txt"
MANIFEST="${TOP}/.repo/manifests/default.xml"
BRANCH=$(grep "default revision" "${MANIFEST}" \
| sed 's/^ *//g;s/<default revision=\"refs\/heads\///g;s/\"//g')
BRANCH=$(git -C ${TOP}/.repo/manifests.git config --get branch.default.merge | sed 's#refs/heads/##g')
STAGINGBRANCH="staging/${BRANCH}_${OPERATION}-${NEWTAG}"
# Build list of LineageOS forked repos