commit 7c3ad282bc9feb4ec2b518950916c5728d64a638
author Tim Zimmermann <tim@linux4.de> Sat Dec 24 10:01:53 2022 +0100
committer Tim Zimmermann <tim@linux4.de> Sat Dec 24 10:01:53 2022 +0100
tree ffe722327c74bd59815f53b0bbeaa17a6726369d
parent d378e7be0b95785fa21a07f67afba6fccb4e96a6

scripts: aosp-merger: Use existing BRANCH variable

Change-Id: I589aa4570dd6b4f340eb90eeae13f065b0b3b9a3

aosp-merger/aosp-merger.sh

diff --git a/aosp-merger/aosp-merger.sh b/aosp-merger/aosp-merger.sh
index 6bb49e3..8433497 100755
--- a/aosp-merger/aosp-merger.sh
+++ b/aosp-merger/aosp-merger.sh
@@ -99,7 +99,7 @@
 
     if [[ "${PROJECTOPERATION}" == "merge" ]]; then
         echo "#### Merging ${NEWTAG} into ${PROJECTPATH} ####"
-        git merge --log "${NEWTAG}" --into-name "$(repo info . | grep 'Manifest revision' | cut -f3 -d '/')"
+        git merge --log "${NEWTAG}" --into-name "${BRANCH}"
     elif [[ "${PROJECTOPERATION}" == "rebase" ]]; then
         echo "#### Rebasing ${PROJECTPATH} onto ${NEWTAG} ####"
         git rebase --onto "${NEWTAG}" "${OLDTAG}"