From 1aa58d42a52b8fa39f16ad169fc405f276c36ae5 Mon Sep 17 00:00:00 2001
From: jzhang046 <25826821+jzhang046@users.noreply.github.com>
Date: Sun, 27 Nov 2022 17:54:24 +0800
Subject: fix(changelog): generate correct commit link in markdown (#11356)

---
 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 6489a3cb2..a5cc468f2 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -209,7 +209,7 @@ function display-release {
     case "$output" in
     raw) printf '%s' "$hash" ;;
     text) printf '\e[33m%s\e[0m' "$hash" ;; # red
-    md) printf '[`%s`](https://github.com/ohmyzsh/ohmyzsh/commit/%s)' "$hash" ;;
+    md) printf '[`%s`](https://github.com/ohmyzsh/ohmyzsh/commit/%s)' "$hash" "$hash" ;;
     esac
   }
 
-- 
cgit v1.2.3-70-g09d2


From 3fca9c8933afc5c118a73cedb171a3c7b8e92730 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Tue, 3 Jan 2023 10:02:03 +0100
Subject: fix(upgrade): check if git is available and working

macOS seems to break dev tools when updating the system. This should
prevent the previous issues. See #11309

Closes #11420
---
 tools/check_for_upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index cc527e72d..3a6bb6555 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -24,7 +24,7 @@ zstyle -s ':omz:update' mode update_mode || {
 # - git is unavailable on the system.
 if [[ "$update_mode" = disabled ]] \
    || [[ ! -w "$ZSH" || ! -O "$ZSH" ]] \
-   || ! command -v git &>/dev/null; then
+   || ! command git --version 2>&1 >/dev/null; then
   unset update_mode
   return
 fi
-- 
cgit v1.2.3-70-g09d2