소스 검색

Merge pull request #11408 from Mashimiao/fix-wrong-tab-completion

fix wrong tab completion
Jessie Frazelle 10 년 전
부모
커밋
ba6de9121f
2개의 변경된 파일4개의 추가작업 그리고 14개의 파일을 삭제
  1. 1 1
      contrib/completion/fish/docker.fish
  2. 3 13
      contrib/completion/zsh/_docker

+ 1 - 1
contrib/completion/fish/docker.fish

@@ -16,7 +16,7 @@
 
 function __fish_docker_no_subcommand --description 'Test if docker has yet to be given the subcommand'
     for i in (commandline -opc)
-        if contains -- $i attach build commit cp create diff events exec export history images import info insert inspect kill load login logout logs pause port ps pull push restart rm rmi run save search start stop tag top unpause version wait
+        if contains -- $i attach build commit cp create diff events exec export history images import info inspect kill load login logout logs pause port ps pull push rename restart rm rmi run save search start stop tag top unpause version wait
             return 1
         end
     end

+ 3 - 13
contrib/completion/zsh/_docker

@@ -270,11 +270,6 @@ __docker_subcommand () {
                 {-q,--quiet}'[Only show numeric IDs]' \
                 ':repository:__docker_repositories'
             ;;
-        (inspect)
-            _arguments \
-                {-f,--format=-}'[Format the output using the given go template]:template: ' \
-                '*:containers:__docker_containers'
-            ;;
         (import)
             _arguments \
                 ':URL:(- http:// file://)' \
@@ -282,15 +277,10 @@ __docker_subcommand () {
             ;;
         (info)
             ;;
-        (import)
+        (inspect)
             _arguments \
-                ':URL:(- http:// file://)' \
-                ':repository:__docker_repositories_with_tags'
-            ;;
-        (insert)
-            _arguments '1:containers:__docker_containers' \
-                       '2:URL:(http:// file://)' \
-                       '3:file:_files'
+                {-f,--format=-}'[Format the output using the given go template]:template: ' \
+                '*:containers:__docker_containers'
             ;;
         (kill)
             _arguments \