aliases: Do not allow mix of git-zsh and git

Bash-it · Feb 6, 2021 · 051da8a · 051da8a
1 parent 53894cd
commit 051da8a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/aliases/available/git-zsh.aliases.bash b/aliases/available/git-zsh.aliases.bash
@@ -1,8 +1,11 @@
 # shellcheck shell=bash
 cite 'about-alias'
-about-alias 'git aliases from oh-my-zsh'
+about-alias 'git aliases from oh-my-zsh (incompatible with regular git aliases option)'
 
-# We are not vendoring this, as we need to adapt it to bash :(
+if [[ -n $_bash_it_git_aliases_enabled ]]; then
+	_log_error "git-zsh aliases are incompatible with regular git aliases"
+	return
+fi
 
 # MIT License
 

diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
@@ -2,6 +2,9 @@
 cite 'about-alias'
 about-alias 'common git abbreviations'
 
+# We can use this variable to make sure that we don't accidentally clash with git-zsh aliases
+_bash_it_git_aliases_enabled=true
+
 alias g='git'
 alias get='git'