Browse Source

fix(git-commit): avoid conflict with `aliases` var

Closes #11876
Carlo Sala 8 months ago
parent
commit
8e8ec1348b
1 changed files with 10 additions and 6 deletions
  1. 10 6
      plugins/git-commit/git-commit.plugin.zsh

+ 10 - 6
plugins/git-commit/git-commit.plugin.zsh

@@ -1,10 +1,11 @@
-_register() {
-  if ! git config --global --get-all alias.$1 &>/dev/null; then
+function _git_commit_register {
+  if ! git config --global --get-all alias.$1 >/dev/null 2>&1; then
     git config --global alias.$1 '!a() { if [[ "$1" == "-s" || "$1" == "--scope" ]]; then git commit -m "'$1'(${2}): ${@:3}"; else git commit -m "'$1': ${@}"; fi }; a'
     git config --global alias.$1 '!a() { if [[ "$1" == "-s" || "$1" == "--scope" ]]; then git commit -m "'$1'(${2}): ${@:3}"; else git commit -m "'$1': ${@}"; fi }; a'
   fi
   fi
 }
 }
 
 
-aliases=(
+local -a _git_commit_aliases
+_git_commit_aliases=(
   'build'
   'build'
   'chore'
   'chore'
   'ci'
   'ci'
@@ -18,6 +19,9 @@ aliases=(
   'test'
   'test'
 )
 )
 
 
-for alias in "${aliases[@]}"; do
-  _register $alias
-done
+for _alias in "${_git_commit_aliases[@]}"; do
+  _git_commit_register $_alias
+done
+
+unfunction _git_commit_register
+unset _alias