From f7267d3f9bec71e80907b67d34ea18fad103613b Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sat, 6 Feb 2021 22:37:24 +0200
Subject: [PATCH] aliases: Do not allow mix of git-omz and git

---
 aliases/available/git-omz.aliases.bash | 7 +++++--
 aliases/available/git.aliases.bash     | 3 +++
 test/lib/search.bats                   | 9 ++++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/aliases/available/git-omz.aliases.bash b/aliases/available/git-omz.aliases.bash
index 06895938..4423eab2 100644
--- a/aliases/available/git-omz.aliases.bash
+++ b/aliases/available/git-omz.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-omz aliases are incompatible with regular git aliases"
+	return
+fi
 
 # Load after regular git aliases
 # BASH_IT_LOAD_PRIORITY: 160
diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index 8cafa82b..268c87fd 100644
--- 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'
 
diff --git a/test/lib/search.bats b/test/lib/search.bats
index 2081abab..d966b183 100644
--- a/test/lib/search.bats
+++ b/test/lib/search.bats
@@ -39,7 +39,14 @@ function local_teardown {
 
 @test "search: git" {
   run _bash-it-search 'git' --no-color
-  assert_line -n 0 '      aliases:  git   gitsvn  '
+
+  assert_line -n 0 -p '      aliases:'
+  for alias in 'git' 'gitsvn' 'git-omz'
+  do
+    echo $alias
+    assert_line -n 0 -p $alias
+  done
+
   assert_line -n 1 -p '      plugins:'
   for plugin in "autojump" "git" "gitstatus" "git-subrepo" "jgitflow" "jump"
   do