forked from toolshed/abra-bash
Drop force and keep going on non-interctive git stuff
This commit is contained in:
parent
3cff8aaada
commit
d16eb0e309
8
abra
8
abra
@ -2212,7 +2212,7 @@ sub_recipe_release() {
|
||||
if [ "$abra___no_prompt" = "false" ]; then
|
||||
git commit -avem "Version $new_version; sync labels" || exit
|
||||
else
|
||||
git commit -am "Version $new_version; sync labels" || exit
|
||||
git commit -am "Version $new_version; sync labels" || true
|
||||
fi
|
||||
|
||||
if [ "$abra___no_prompt" = "false" ]; then
|
||||
@ -2232,17 +2232,17 @@ sub_recipe_release() {
|
||||
if [ "$abra___no_prompt" = "false" ]; then
|
||||
git tag -aem "$latest_version_message" "$new_version"
|
||||
else
|
||||
git tag -am "$latest_version_message" "$new_version"
|
||||
git tag -am "$latest_version_message" "$new_version" || true
|
||||
fi
|
||||
|
||||
if [ "$abra___no_prompt" = "false" ]; then
|
||||
read -rp "Git push this new tag? [y/N]? " choice
|
||||
|
||||
if [ "${choice,,}" != "y" ]; then
|
||||
git push --force
|
||||
git push && git push --tags
|
||||
fi
|
||||
else
|
||||
git push --force
|
||||
git push && git push --tags
|
||||
fi
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user