LineageOS/scripts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aosp-merger: Abandon staging branch inside _merge_helper

Browse Source 
Change-Id: Iea165da1de035cd4228ac28ce351ee3616c4e050
This commit is contained in:
Michael Bestas
2022-06-19 08:03:18 +03:00
committed by Chirayu Desai
parent 3b8c42073d
commit d9c87a53d5
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
aosp-merger/_merge_helper.sh
View File

@@ -61,6 +61,8 @@ BRANCH="${lineageos_branch}"
STAGINGBRANCH="staging/${BRANCHSUFFIX}" STAGINGBRANCH="staging/${BRANCHSUFFIX}"
cd "${TOP}/${PROJECTPATH}" cd "${TOP}/${PROJECTPATH}"
# Ditch any existing staging branches
repo abandon "${STAGINGBRANCH}" .
repo start "${STAGINGBRANCH}" . repo start "${STAGINGBRANCH}" .
if [ -f ".gitupstream" ]; then if [ -f ".gitupstream" ]; then
git fetch -q --force --tags "$(cat .gitupstream)" "${NEWTAG}" git fetch -q --force --tags "$(cat .gitupstream)" "${NEWTAG}"

3
aosp-merger/merge-aosp-forks.sh
View File

@@ -76,9 +76,6 @@ for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do
done done
echo "#### Verification complete - no uncommitted changes found ####" echo "#### Verification complete - no uncommitted changes found ####"
# Ditch any existing staging branches (across all projects)
repo abandon "${STAGINGBRANCH}"
# Iterate over each forked project # Iterate over each forked project
for PROJECTPATH in ${PROJECTPATHS}; do for PROJECTPATH in ${PROJECTPATHS}; do
"${script_path}"/_merge_helper.sh --project-path "${PROJECTPATH}" --operation "${OPERATION}" --old-tag "${OLDTAG}" --new-tag "${NEWTAG}" --branch-suffix "${BRANCHSUFFIX}" "${script_path}"/_merge_helper.sh --project-path "${PROJECTPATH}" --operation "${OPERATION}" --old-tag "${OLDTAG}" --new-tag "${NEWTAG}" --branch-suffix "${BRANCHSUFFIX}"

3
aosp-merger/merge-aosp.sh
View File

@@ -72,9 +72,6 @@ for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do
done done
echo "#### Verification complete - no uncommitted changes found ####" echo "#### Verification complete - no uncommitted changes found ####"
# Ditch any existing staging branches (across all projects)
repo abandon "${STAGINGBRANCH}"
# Iterate over each forked project # Iterate over each forked project
for PROJECTPATH in ${PROJECTPATHS}; do for PROJECTPATH in ${PROJECTPATHS}; do
"${script_path}"/_merge_helper.sh --project-path "${PROJECTPATH}" --operation "${OPERATION}" --old-tag "${OLDTAG}" --new-tag "${NEWTAG}" --branch-suffix "${BRANCHSUFFIX}" "${script_path}"/_merge_helper.sh --project-path "${PROJECTPATH}" --operation "${OPERATION}" --old-tag "${OLDTAG}" --new-tag "${NEWTAG}" --branch-suffix "${BRANCHSUFFIX}"