From 349fbe0f23d55d964f1902d226218e1bd3f2739d Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Thu, 25 May 2023 11:50:25 +0200
Subject: [PATCH] pre_merge.sh: ignore failure during git tag

Do not fail if tag already exists

Change-Id: I8c54fe85879e8bd1866ee96951aca406a03862ed
---
 pre_merge.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre_merge.sh b/pre_merge.sh
index e0f3d8ae74..79e37d7659 100755
--- a/pre_merge.sh
+++ b/pre_merge.sh
@@ -13,7 +13,7 @@ versionMajor=`get_prop ext.versionMajor`
 versionMinor=`get_prop ext.versionMinor`
 versionPatch=`get_prop ext.versionPatch`
 tag="sc_last_v$versionMajor.$versionMinor.$versionPatch"
-git tag "$tag"
+git tag "$tag" || true
 
 # Revert Schildi's upstream string changes
 git checkout `upstream_common_base` -- "$mydir/library/ui-strings/src/main/res/**/strings.xml"