xstefen
/
calyxos-scripts
mirror of https://github.com/CalyxOS/scripts
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "aosp-merger: Check if branch exists before abandoning" 

This reverts commit c687bd73d9.

Reason for revert: Not working now for some reason

Change-Id: I0b97da59b324f08449aaf643c13f0c563ce642ef
This commit is contained in:
Michael Bestas 2023-11-29 15:30:52 +00:00
parent c9d697023e
commit 8971003d67
No known key found for this signature in database
GPG Key ID: F2D6C348F85577F5
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
aosp-merger/_merge_helper.sh
View File

@ -66,9 +66,7 @@ STAGINGBRANCH="staging/${BRANCHSUFFIX}"
cd "${TOP}/${PROJECTPATH}"
# Ditch any existing staging branches
if [[ "$(git show-ref --verify --quiet refs/heads/${STAGINGBRANCH})" ]]; then
repo abandon "${STAGINGBRANCH}" .
fi
repo abandon "${STAGINGBRANCH}" .
repo start "${STAGINGBRANCH}" .
if [ -f ".gitupstream-lineage" ]; then
if grep -q "${lineageos_device_branch}" .gitupstream-lineage; then

4
aosp-merger/_subtree_merge_helper.sh
View File

@ -66,9 +66,7 @@ STAGINGBRANCH="staging/${BRANCHSUFFIX}"
cd "${TOP}/${PROJECTPATH}"
# Ditch any existing staging branches
if [[ "$(git show-ref --verify --quiet refs/heads/${STAGINGBRANCH})" ]]; then
repo abandon "${STAGINGBRANCH}" .
fi
repo abandon "${STAGINGBRANCH}" .
repo start "${STAGINGBRANCH}" .
if [ -f ".gitupstream" ]; then
git fetch -q --force --tags "$(cat .gitupstream)" "${NEWTAG}"