This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to tag tags/v3/01-01-starter-app in repository https://gitbox.apache.org/repos/asf/causeway-app-petclinic.git
commit 2d40c008674a8368cd0424e7b94d2ada6978071e Author: Dan Haywood <[email protected]> AuthorDate: Mon Jun 3 13:05:42 2024 +0100 simplifies v3 recreate script, remove merges --- recreate-v3-tags.sh | 61 +++-------------------------------------------------- 1 file changed, 3 insertions(+), 58 deletions(-) diff --git a/recreate-v3-tags.sh b/recreate-v3-tags.sh index f6e6ac6..d5d8858 100755 --- a/recreate-v3-tags.sh +++ b/recreate-v3-tags.sh @@ -21,7 +21,7 @@ while getopts ":hPf:x" arg; do EXECUTE="yes" ;; f) - FROM_TAG=$OPTARG + FROM_TAG=$(echo $OPTARG | sed s/v3/v2/) shift ;; P) @@ -48,55 +48,8 @@ else git tag | grep v2 > $TAG_NAMES fi -if [ -z $FROM_TAG ] -then - for TAGV3 in $(git tag | grep v3) - do - - echo git tag -d $TAGV3 - if [ "$EXECUTE" = "yes" ] - then - git tag -d $TAGV3 - read -p "continue?" - fi - - if [ "$PUSH" = "yes" ] - then - echo git push origin $TAGV3 --delete - if [ "$EXECUTE" = "yes" ] - then - git push origin $TAGV3 --delete - read -p "continue?" - fi - fi - - done -fi - -if [ -n $FROM_TAG ] -then - TAGV2=$(cat $TAG_NAMES | head -1) - TAGV3=$(echo $TAGV2 | sed s/v2/v3/) - - echo git merge $TAGV2 --no-edit - if [ "$EXECUTE" = "yes" ] - then - git merge $TAGV2 --no-edit - read -p "continue?" - fi - - echo git tag $TAGV3 - if [ "$EXECUTE" = "yes" ] - then - git tag $TAGV3 - read -p "continue?" - fi - PREV=$TAGV2 -else - PREV="" -fi - -for TAGV2 in $(cat $TAG_NAMES | tail +2) +PREV="" +for TAGV2 in $(cat $TAG_NAMES) do TAGV3=$(echo $TAGV2 | sed s/v2/v3/) @@ -110,13 +63,6 @@ do fi fi - echo git merge $TAGV2 --no-edit - if [ "$EXECUTE" = "yes" ] - then - git merge $TAGV2 --no-edit - read -p "continue?" - fi - echo git tag $TAGV3 if [ "$EXECUTE" = "yes" ] then @@ -125,6 +71,5 @@ do fi PREV=$TAGV2 - done
