From 4b2431e8b1c08a2dc14fe31bf07a5e5f08eaa87e Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Mon, 28 Dec 2020 19:35:43 +0100
Subject: fix(updater): don't pipe changelog to less when updating

Fixes #9509
---
 tools/upgrade.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'tools')

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 4df7eb184..358242d0f 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -75,14 +75,10 @@ if git pull --rebase --stat origin master; then
 
     # Display changelog with less if available, otherwise just print it to the terminal
     if [[ "$1" = --interactive ]]; then
-      if (( $+commands[less] )); then
-        "$ZSH/tools/changelog.sh" HEAD "$last_commit" --text | LESS= command less -R
-      else
-        "$ZSH/tools/changelog.sh" HEAD "$last_commit"
-      fi
+      "$ZSH/tools/changelog.sh" HEAD "$last_commit"
     fi
 
-    printf "${BLUE}%s \`${BOLD}%s${RESET}${BLUE}\`${RESET}\n" "You can see the changelog again with" "omz changelog"
+    printf "${BLUE}%s \`${BOLD}%s${RESET}${BLUE}\`${RESET}\n" "You can see the changelog with" "omz changelog"
   fi
 
   printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n' $RAINBOW $RESET
-- 
cgit v1.2.3-70-g09d2


From a4a79eaa8cdf39f35dcd1753b973e830ff7b00b8 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Wed, 30 Dec 2020 20:02:24 +0100
Subject: fix(changelog): remove CR characters in breaking change messages

The GitHub UI might not remove CR characters from commit description forms
filled from a Windows browser.
---
 tools/changelog.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tools')

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 8753212e9..634b61d01 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -91,6 +91,8 @@ function parse-commit {
     if [[ "$body" =~ "BREAKING CHANGE: (.*)" || \
       "$subject" =~ '^[^ :\)]+\)?!: (.*)$' ]]; then
       message="${match[1]}"
+      # remove CR characters (might be inserted in GitHub UI commit description form)
+      message="${message//$'\r'/}"
       # skip next paragraphs (separated by two newlines or more)
       message="${message%%$'\n\n'*}"
       # ... and replace newlines with spaces
-- 
cgit v1.2.3-70-g09d2


From 86f805280f6a8cf65d8d0a9380489aae4b72f767 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Tue, 5 Jan 2021 19:17:27 +0100
Subject: fix(changelog): display scope in breaking change messages

---
 tools/changelog.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 634b61d01..7275db53a 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -286,7 +286,7 @@ function display-release {
 
     local hash subject
     for hash message in ${(kv)breaking}; do
-      echo " - $(fmt:hash) $(fmt:subject "${message}")"
+      echo " - $(fmt:hash) $(fmt:scope) $(fmt:subject "${message}")"
     done | sort
     echo
   }
-- 
cgit v1.2.3-70-g09d2


From 3d51d6307791cf49c2ef28f2c05a542e521d85d7 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <hello@mcornella.com>
Date: Sun, 10 Jan 2021 20:43:32 +0100
Subject: fix(changelog): fix spacing in breaking changes message

---
 tools/changelog.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 7275db53a..836afef14 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -286,7 +286,7 @@ function display-release {
 
     local hash subject
     for hash message in ${(kv)breaking}; do
-      echo " - $(fmt:hash) $(fmt:scope) $(fmt:subject "${message}")"
+      echo " - $(fmt:hash) $(fmt:scope)$(fmt:subject "${message}")"
     done | sort
     echo
   }
-- 
cgit v1.2.3-70-g09d2