From a3643f124e91d9ef55da5c0bcf2b3be257e84843 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Wed, 19 May 2021 19:54:57 -0500
Subject: [PATCH] git: Optimize scripts for git helper functions

Optimize git internal calls and adjustment git helper functions to use
more idiomatic Zsh conventions avoiding external calls.
---
 modules/git/functions/git-hub-browse              | 12 ++++++------
 modules/git/functions/git-hub-shorten-url         |  2 +-
 modules/git/functions/git-info                    |  4 ++--
 modules/git/functions/git-stash-clear-interactive |  2 +-
 modules/git/functions/git-submodule-move          |  2 +-
 modules/git/functions/git-submodule-remove        |  6 +++---
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/git/functions/git-hub-browse b/modules/git/functions/git-hub-browse
index cb3fc60..bdeb298 100644
--- a/modules/git/functions/git-hub-browse
+++ b/modules/git/functions/git-hub-browse
@@ -15,7 +15,7 @@ fi
 local remotes remote references reference file url
 
 remote="${1:-origin}"
-remotes=($(command git config --get-regexp 'remote.*.url' | cut -d. -f2))
+remotes=($(command git remote show))
 
 if (( $remotes[(i)$remote] == $#remotes + 1 )); then
   print "$0: remote not found: $remote" >&2
@@ -23,14 +23,14 @@ if (( $remotes[(i)$remote] == $#remotes + 1 )); then
 fi
 
 url=$(
-  command git config --get "remote.${remote}.url" \
-    | sed -En "s/(git|https?)(@|:\/\/)github.com(:|\/)(.+)\/(.+).git/https:\/\/github.com\/\4\/\5/p"
+  command git remote get-url "$remote" \
+      | sed -En "s#(git@|https?://)(github.com)(:|/)(.+)/(.+)\.git#https://\2/\4/\5#p"
 )
 
 reference="${${2:-$(git-branch-current)}:-HEAD}"
 references=(
   HEAD
-  ${$(command git ls-remote --heads --tags "$remote" | awk '{print $2}')##refs/(heads|tags)/}
+  ${${(f)"$(command git ls-remote --heads --tags "$remote")"}##*refs/(heads|tags)/}
 )
 
 if (( $references[(i)$reference] == $#references + 1 )); then
@@ -45,9 +45,9 @@ fi
 file="$3"
 
 if [[ -n "$url" ]]; then
-  url="${url}/tree/${reference}/${file}"
+  url="$url/tree/$reference/$file"
 
-  if (( $+commands[$BROWSER] )); then
+  if [[ -z "$BROWSER" ]]; then
     "$BROWSER" "$url"
     return 0
   else
diff --git a/modules/git/functions/git-hub-shorten-url b/modules/git/functions/git-hub-shorten-url
index 470c093..b9edd01 100644
--- a/modules/git/functions/git-hub-shorten-url
+++ b/modules/git/functions/git-hub-shorten-url
@@ -19,7 +19,7 @@ if [[ -z "$url" || ! "$url" =~ ^https?:\/\/.*github.com\/ ]]; then
 fi
 
 if (( $+commands[curl] )); then
-  curl -s -i 'https://git.io' -F "url=$url" ${(s: :)code:+ -F "code=$code"} | sed -n 's/^Location: //p'
+  print "${${(@M)${(f)"$(curl -s -i 'https://git.io' -F "url=$url" ${(z)code:+ -F "code=$code"})"}:#Location: *}#Location: }"
 else
   print "$0: command not found: curl" >&2
   return 1
diff --git a/modules/git/functions/git-info b/modules/git/functions/git-info
index af0bea5..07f261d 100644
--- a/modules/git/functions/git-info
+++ b/modules/git/functions/git-info
@@ -229,8 +229,8 @@ function git-info {
       [[ "$commondir" =~ ^/ ]] || commondir="$(git-dir)/$commondir"
     fi
     if [[ -f "$(git-dir)/refs/stash" || ( -n "$commondir" && -f "$commondir/refs/stash" ) ]]; then
-      stashed="$(command git stash list 2> /dev/null | wc -l | awk '{print $1}')"
-      if [[ -n "$stashed" ]]; then
+      stashed=${#${(f)"$(command git stash list 2> /dev/null)"}}
+      if (( $stashed > 0 )); then
         zformat -f stashed_formatted "$stashed_format" "S:$stashed"
       fi
     fi
diff --git a/modules/git/functions/git-stash-clear-interactive b/modules/git/functions/git-stash-clear-interactive
index cc665a1..163deac 100644
--- a/modules/git/functions/git-stash-clear-interactive
+++ b/modules/git/functions/git-stash-clear-interactive
@@ -15,7 +15,7 @@ fi
 local stashed
 
 if [[ -f "$(git-dir)/refs/stash" ]]; then
-  stashed="$(command git stash list 2> /dev/null | wc -l | awk '{print $1}')"
+  stashed=${#${(f)"$(command git stash list 2> /dev/null)"}}
   if (( $stashed > 0 )); then
     if read -q "?Clear $stashed stashed state(s) [y/N]? "; then
       command git stash clear
diff --git a/modules/git/functions/git-submodule-move b/modules/git/functions/git-submodule-move
index 746f46e..5e162a1 100644
--- a/modules/git/functions/git-submodule-move
+++ b/modules/git/functions/git-submodule-move
@@ -26,7 +26,7 @@ if [[ -z "$url" ]]; then
   return 1
 fi
 
-mkdir -p "${dst:h}"
+mkdir -p "$dst:h"
 
 git-submodule-remove "$src"
 command git submodule add "$url" "$dst"
diff --git a/modules/git/functions/git-submodule-remove b/modules/git/functions/git-submodule-remove
index c8c11aa..b523314 100644
--- a/modules/git/functions/git-submodule-remove
+++ b/modules/git/functions/git-submodule-remove
@@ -22,9 +22,9 @@ command git config --file "$(git-dir)/config" --remove-section "submodule.${1}"
 command git config --file "$(git-root)/.gitmodules" --remove-section "submodule.${1}" &> /dev/null
 command git add .gitmodules
 
-command git rm --cached -rf "${1}"
-rm -rf "${1}"
-rm -rf "$(git-dir)/modules/${1}"
+command git rm --cached -rf "$1"
+rm -rf "$1"
+rm -rf "$(git-dir)/modules/$1"
 
 return 0