plugins/git-commit/README.md

@@ -1,8 +1,6 @@
 # git-commit plugin
 
-The git-commit plugin adds several
-[git aliases](https://www.git-scm.com/docs/git-config#Documentation/git-config.txt-alias) for
-[conventional commit](https://www.conventionalcommits.org/en/v1.0.0/#summary) messages.
+The git-commit plugin adds several [git aliases](https://www.git-scm.com/docs/git-config#Documentation/git-config.txt-alias) for [conventional commit](https://www.conventionalcommits.org/en/v1.0.0/#summary) messages.
 
 To use it, add `git-commit` to the plugins array in your zshrc file:
 
@@ -13,9 +11,11 @@ plugins=(... git-commit)
 ## Syntax
 
 ```zsh
-git <type> [(-s, --scope) "<scope>"] [(-a, --attention)] "<message>"
+git <type> [(-s, --scope) "<scope>"] "<message>"
 ```
 
+> ⚠️ Single/Double quotes around the scope and message are required
+
 Where `type` is one of the following:
 
 - `build`
@@ -34,9 +34,6 @@ Where `type` is one of the following:
 > NOTE: the alias for `revert` type is `rev`, as otherwise it conflicts with the git command of the same name.
 > It will still generate a commit message in the format `revert: <message>`
 
-> ⚠️ Enabling this plugin will (potentially) overwrite all `alias.<type>` that you manually set. Use with
-> care!
-
 ## Examples
 
 | Git alias                                     | Command                                              |

plugins/git-commit/git-commit.plugin.zsh

@@ -1,9 +1,3 @@
-local _rev="$(git -C $ZSH rev-parse HEAD 2> /dev/null)"
-if [[ $_rev == $(git config --global --get oh-my-zsh.git-commit-alias 2> /dev/null) ]]; then
-  return
-fi
-git config --global oh-my-zsh.git-commit-alias "$_rev"
-
 local -a _git_commit_aliases
 _git_commit_aliases=(
   'build'
@@ -20,39 +14,19 @@ _git_commit_aliases=(
   'wip'
 )
 
-local _alias _type
-for _type in "${_git_commit_aliases[@]}"; do
+local alias type
+for type in "${_git_commit_aliases[@]}"; do
   # an alias can't be named "revert" because the git command takes precedence
   # https://stackoverflow.com/a/3538791
-  case "$_type" in
-    revert) _alias=rev ;;
-    *) _alias=$_type ;;
+  case "$type" in
+  revert) alias=rev ;;
+  *) alias=$type ;;
   esac
 
-  local _func='!a() {
-local _scope _attention _message
-while [ $# -ne 0 ]; do
-case $1 in
-  -s | --scope )
-    if [ -z $2 ]; then
-      echo "Missing scope!"
-      return 1
+  local func='!a() { if [ "$1" = "-s" ] || [ "$1" = "--scope" ]; then local scope="$2"; shift 2; git commit -m "'$type'(${scope}): ${@}"; else git commit -m "'$type': ${@}"; fi }; a'
+  if ! git config --global --get-all alias.${alias} >/dev/null 2>&1; then
+    git config --global alias.${alias} "$func"
   fi
-    _scope="$2"
-    shift 2
-    ;;
-  -a | --attention )
-    _attention="!"
-    shift 1
-    ;;
-  * )
-    _message+=" $1"
-    shift 1
-    ;;
-esac
 done
-git commit -m "'$_type'${_scope:+(${_scope})}${_attention}:${_message}"
-}; a'
 
-  git config --global alias.$_alias "$_func"
-done
+unset _git_commit_aliases alias type func

plugins/tmux/tmux.plugin.zsh

@@ -49,7 +49,7 @@ fi
 # ALIASES
 function _build_tmux_alias {
   eval "function $1 {
-    if [[ -z \$1 ]] || [[ \${1:0:1} == '-' ]]; then
+    if [[ -z \$1 ]] || [[ \${1::1} == '-' ]]; then
       tmux $2 \"\$@\"
     else
       tmux $2 $3 \"\$@\"