From 8971003d673f3ff6fa47255e2f1fe50a5d7abdc5 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@gmail.com>
Date: Wed, 29 Nov 2023 15:30:52 +0000
Subject: [PATCH] Revert "aosp-merger: Check if branch exists before
 abandoning"

This reverts commit c687bd73d9744a58a1d5b6a27d829f4663bcc674.

Reason for revert: Not working now for some reason

Change-Id: I0b97da59b324f08449aaf643c13f0c563ce642ef
---
 aosp-merger/_merge_helper.sh         | 4 +---
 aosp-merger/_subtree_merge_helper.sh | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

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}"