pre_merge.sh: ignore failure during git tag

Do not fail if tag already exists Change-Id: I8c54fe85879e8bd1866ee96951aca406a03862ed
2023-05-25 11:50:25 +02:00 · 2023-05-25 11:50:25 +02:00 · 349fbe0f23
parent 035e8e3f98
commit 349fbe0f23
1 changed files with 1 additions and 1 deletions
--- 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"