diff --git a/aosp-merger/_merge_helper.sh b/aosp-merger/_merge_helper.sh index 9d259b8..71ae954 100755 --- a/aosp-merger/_merge_helper.sh +++ b/aosp-merger/_merge_helper.sh @@ -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 diff --git a/aosp-merger/_subtree_merge_helper.sh b/aosp-merger/_subtree_merge_helper.sh index a199cd1..67532b9 100755 --- a/aosp-merger/_subtree_merge_helper.sh +++ b/aosp-merger/_subtree_merge_helper.sh @@ -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}"