From f5753e44169dbb11f8800310202206be0e9064d2 Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Mon, 14 Dec 2020 01:21:00 +0200
Subject: [PATCH 1/3] test: Add test for aliases rm for alias_completion

---
 test/plugins/alias-completion.plugin.bats | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/plugins/alias-completion.plugin.bats b/test/plugins/alias-completion.plugin.bats
index 76d4ed04..c400388b 100644
--- a/test/plugins/alias-completion.plugin.bats
+++ b/test/plugins/alias-completion.plugin.bats
@@ -22,3 +22,10 @@ load ../../completion/available/git.completion
 
   assert_success
 }
+
+@test "alias-completion: See that having aliased rm command does not output unnecessary output" {
+  alias rm='rm -v'
+  load ../../plugins/available/alias-completion.plugin
+
+  refute_output
+}

From 1c05d71819e03a191b809221904d454784015cfe Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Mon, 14 Dec 2020 01:25:58 +0200
Subject: [PATCH 2/3] alias-completion: Use 'command rm' instead of rm to avoid
 aliases

---
 plugins/available/alias-completion.plugin.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/available/alias-completion.plugin.bash b/plugins/available/alias-completion.plugin.bash
index 5e0ea7fe..b1f7c3cf 100644
--- a/plugins/available/alias-completion.plugin.bash
+++ b/plugins/available/alias-completion.plugin.bash
@@ -91,5 +91,5 @@ function alias_completion {
             echo "$new_completion" >> "$tmp_file"
         fi
     done < <(alias -p | sed -Ene "s/$alias_regex/\2 '\3' '\4'/p")
-    source "$tmp_file" && rm -f "$tmp_file"
+    source "$tmp_file" && command rm -f "$tmp_file"
 }; alias_completion

From b19c2b969fce6f68a839aa474a13782f65422cbb Mon Sep 17 00:00:00 2001
From: Noah Gorny <noah@gittabags.com>
Date: Sun, 27 Dec 2020 17:12:22 +0200
Subject: [PATCH 3/3] test: Change alias-completion completion file to
 capistrano

---
 test/plugins/alias-completion.plugin.bats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/plugins/alias-completion.plugin.bats b/test/plugins/alias-completion.plugin.bats
index c400388b..1a78e462 100644
--- a/test/plugins/alias-completion.plugin.bats
+++ b/test/plugins/alias-completion.plugin.bats
@@ -7,7 +7,7 @@ load ../../lib/helpers
 
 cite _about _param _example _group _author _version
 
-load ../../completion/available/git.completion
+load ../../completion/available/capistrano.completion
 
 @test "alias-completion: See that aliases with double quotes and brackets do not break the plugin" {
   alias gtest="git log --graph --pretty=format:'%C(bold)%h%Creset%C(magenta)%d%Creset %s %C(yellow)<%an> %C(cyan)(%cr)%Creset' --abbrev-commit --date=relative"