mirror of https://github.com/CalyxOS/scripts
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:
parent
c9d697023e
commit
8971003d67
|
@ -66,9 +66,7 @@ STAGINGBRANCH="staging/${BRANCHSUFFIX}"
|
||||||
|
|
||||||
cd "${TOP}/${PROJECTPATH}"
|
cd "${TOP}/${PROJECTPATH}"
|
||||||
# Ditch any existing staging branches
|
# Ditch any existing staging branches
|
||||||
if [[ "$(git show-ref --verify --quiet refs/heads/${STAGINGBRANCH})" ]]; then
|
repo abandon "${STAGINGBRANCH}" .
|
||||||
repo abandon "${STAGINGBRANCH}" .
|
|
||||||
fi
|
|
||||||
repo start "${STAGINGBRANCH}" .
|
repo start "${STAGINGBRANCH}" .
|
||||||
if [ -f ".gitupstream-lineage" ]; then
|
if [ -f ".gitupstream-lineage" ]; then
|
||||||
if grep -q "${lineageos_device_branch}" .gitupstream-lineage; then
|
if grep -q "${lineageos_device_branch}" .gitupstream-lineage; then
|
||||||
|
|
|
@ -66,9 +66,7 @@ STAGINGBRANCH="staging/${BRANCHSUFFIX}"
|
||||||
|
|
||||||
cd "${TOP}/${PROJECTPATH}"
|
cd "${TOP}/${PROJECTPATH}"
|
||||||
# Ditch any existing staging branches
|
# Ditch any existing staging branches
|
||||||
if [[ "$(git show-ref --verify --quiet refs/heads/${STAGINGBRANCH})" ]]; then
|
repo abandon "${STAGINGBRANCH}" .
|
||||||
repo abandon "${STAGINGBRANCH}" .
|
|
||||||
fi
|
|
||||||
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}"
|
||||||
|
|
Loading…
Reference in New Issue