Merge pull request #1280 from Bash-it/feature/show-upgrades

Show upgrades before blindly upgrading

lib/helpers.bash

@@ -181,6 +181,20 @@ _bash-it_update() {
   status="$(git rev-list master..${BASH_IT_REMOTE}/master 2> /dev/null)"
 
   if [[ -n "${status}" ]]; then
+
+    for i in $(git rev-list --merges master..${BASH_IT_REMOTE}); do
+      num_of_lines=$(git log -1 --format=%B $i | awk 'NF' | wc -l)
+      if [ $num_of_lines -eq 1 ]; then
+        description="%s"
+      else
+        description="%b"
+      fi
+      git log --format="%h: $description (%an)" -1 $i
+    done
+    echo ""
+    read -e -n 1 -p "Would you like to update to $(git log -1 --format=%h origin/master)? [Y/n] " RESP
+    case $RESP in
+      [yY]|"")
         git pull --rebase &> /dev/null
         if [[ $? -eq 0 ]]; then
           echo "Bash-it successfully updated."
@@ -193,6 +207,14 @@ _bash-it_update() {
         else
           echo "Error updating Bash-it, please, check if your Bash-it installation folder (${BASH_IT}) is clean."
         fi
+        ;;
+      [nN])
+        echo "Not upgrading…"
+        ;;
+      *)
+        echo -e "\033[91mPlease choose y or n.\033[m"
+        ;;
+      esac
   else
     echo "Bash-it is up to date, nothing to do!"
   fi