coop-cloud/abra-bash
coop-cloud
/
abra-bash
5
0
Fork 3
Code Pull Requests Releases Activity

Drop force and keep going on non-interctive git stuff
continuous-integration/drone/push Build is passing Details

This commit is contained in:
decentral1se 2021-06-03 22:12:47 +02:00
parent 3cff8aaada
commit d16eb0e309
No known key found for this signature in database
GPG Key ID: 92DAD76BD9567B8A
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
abra
View File

@ -2212,7 +2212,7 @@ sub_recipe_release() {
if [ "$abra___no_prompt" = "false" ]; then if [ "$abra___no_prompt" = "false" ]; then
git commit -avem "Version $new_version; sync labels" || exit git commit -avem "Version $new_version; sync labels" || exit
else else
git commit -am "Version $new_version; sync labels" || exit git commit -am "Version $new_version; sync labels" || true
fi fi
if [ "$abra___no_prompt" = "false" ]; then if [ "$abra___no_prompt" = "false" ]; then
@ -2232,17 +2232,17 @@ sub_recipe_release() {
if [ "$abra___no_prompt" = "false" ]; then if [ "$abra___no_prompt" = "false" ]; then
git tag -aem "$latest_version_message" "$new_version" git tag -aem "$latest_version_message" "$new_version"
else else
git tag -am "$latest_version_message" "$new_version" git tag -am "$latest_version_message" "$new_version" || true
fi fi
if [ "$abra___no_prompt" = "false" ]; then if [ "$abra___no_prompt" = "false" ]; then
read -rp "Git push this new tag? [y/N]? " choice read -rp "Git push this new tag? [y/N]? " choice
if [ "${choice,,}" != "y" ]; then if [ "${choice,,}" != "y" ]; then
git push --force git push && git push --tags
fi fi
else else
git push --force git push && git push --tags
fi fi
} }