From 9fc4670b3b1f83adc04230619c9181b7d6b4ccce Mon Sep 17 00:00:00 2001
From: Harald Albers <github@albersweb.de>
Date: Thu, 20 Oct 2016 08:54:39 +0200
Subject: [PATCH] Move bash completion logic to new subcommand: rm

Signed-off-by: Harald Albers <github@albersweb.de>
---
 contrib/completion/bash/docker | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker
index b282d984dd..99128b7f1c 100644
--- a/contrib/completion/bash/docker
+++ b/contrib/completion/bash/docker
@@ -1280,7 +1280,22 @@ _docker_container_restart() {
 }
 
 _docker_container_rm() {
-	_docker_rm
+	case "$cur" in
+		-*)
+			COMPREPLY=( $( compgen -W "--force -f --help --link -l --volumes -v" -- "$cur" ) )
+			;;
+		*)
+			for arg in "${COMP_WORDS[@]}"; do
+				case "$arg" in
+					--force|-f)
+						__docker_complete_containers_all
+						return
+						;;
+				esac
+			done
+			__docker_complete_containers_stopped
+			;;
+	esac
 }
 
 _docker_container_run() {
@@ -2538,22 +2553,7 @@ _docker_restart() {
 }
 
 _docker_rm() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--force -f --help --link -l --volumes -v" -- "$cur" ) )
-			;;
-		*)
-			for arg in "${COMP_WORDS[@]}"; do
-				case "$arg" in
-					--force|-f)
-						__docker_complete_containers_all
-						return
-						;;
-				esac
-			done
-			__docker_complete_containers_stopped
-			;;
-	esac
+	_docker_container_rm
 }
 
 _docker_rmi() {