(causeway-app-petclinic) 02/05: adds check if cherry-pick failed

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to tag tags/2.1.0/01-01-starter-app
in repository https://gitbox.apache.org/repos/asf/causeway-app-petclinic.git

commit 3ee5e11d378bca882750580a61b1751dd6083e82
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Jul 22 21:43:43 2024 +0100

    adds check if cherry-pick failed
---
 tagger.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tagger.sh b/tagger.sh
index fe3b302..3204996 100755
--- a/tagger.sh
+++ b/tagger.sh
@@ -75,6 +75,12 @@ do
       if [ "$EXECUTE" = "true" ]
       then
         git cherry-pick $COMMIT
+
+        if [ $? -ne 0 ]
+        then
+            echo "Cherry-pick failed; aborting."
+            exit 1
+        fi
       fi
 
       if [ "$EXECUTE" = "true" ]
@@ -92,7 +98,7 @@ do
     done
 	fi
 
-  echo "git tag $NEW_TAG"
+  echo "git tag -f $NEW_TAG"
 
   if [ "$EXECUTE" = "true" ]
   then