From 53cec2469b8585d261a50746dc329689a2f48ee1 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 3 Jun 2021 10:34:19 +0200 Subject: [PATCH] Handle forcing re-upload --- abra | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/abra b/abra index d3e69dd..d255c22 100755 --- a/abra +++ b/abra @@ -2223,12 +2223,27 @@ sub_recipe_release() { fi fi - test "$force" = "true" && git tag -d "$new_version" + if [ "$force" = "true" ]; then + git tag -d "$new_version" || true + git push origin --delete "$new_version" || true + debug "Deleted local tag and remote tag if present" + fi + if [ "$abra___no_prompt" = "false" ]; then git tag -aem "$latest_version_message" "$new_version" else git tag -am "$latest_version_message" "$new_version" fi + + if [ "$abra___no_prompt" = "false" ]; then + read -rp "Git push this new tag? [y/N]? " choice + + if [ "${choice,,}" != "y" ]; then + git push --force + fi + else + git push --force + fi } #######################################