diff --git a/CHANGELOG.md b/CHANGELOG.md index d8b286c..0a6052d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## TBD ### Added -- `bin/upgrade` displays any changes to the changelog and requires extra +- `bin/upgrade` displays any changes to the changelog and prompts for confirmation before applying the remote changes to the local branch. ## 2020-11-19 diff --git a/bin/upgrade b/bin/upgrade index 4b00c24..22c39c4 100755 --- a/bin/upgrade +++ b/bin/upgrade @@ -166,16 +166,7 @@ function handle_git_update() { echo "No code update available for download" else echo "Code update available for download!" - - local should_fetch="n" - read -r -p "Proceed to download update? [y/n] " should_fetch - - if [[ ! "$should_fetch" =~ [Yy] ]]; then - echo "Continuing without downloading update" - else - echo "Downloading new code..." - git -C "$TOOLKIT_ROOT" fetch origin "$current_branch" - fi + git -C "$TOOLKIT_ROOT" fetch origin "$current_branch" fi if ! is_up_to_date_with_remote "$current_branch"; then